clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • dea1b067bd Merge pull request #1479 from annando/1504-parse_url Tobias Diekershoff 2015-04-10 10:13:13 +02:00
  • 5e3f2b67a8 Merge pull request #1507 from annando/1504-community-automention Tobias Diekershoff 2015-04-10 09:50:08 +02:00
  • 489af0d55d Just added some forgotten escaping. Michael Vogel 2015-04-10 00:54:42 +02:00
  • 662fd84891 Automention of communities when a single contact is selected on the network page. Michael Vogel 2015-04-10 00:42:03 +02:00
  • 26eceaacbe Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow Michael Vogel 2015-04-09 19:49:57 +02:00
  • e81f9c91fa Merge remote-tracking branch 'upstream/develop' into 1504-parse_url Michael Vogel 2015-04-09 19:49:33 +02:00
  • 12c034f4cb Merge remote-tracking branch 'upstream/develop' into 1503-load-issues Michael Vogel 2015-04-09 19:48:10 +02:00
  • 98bf8d85fa The "fastlane" can be removed there. Michael Vogel 2015-04-09 19:35:17 +02:00
  • ccbac6874b The "connect" link ar the display page now directs to the new "follow" page as well. Michael Vogel 2015-04-09 07:45:48 +02:00
  • 015ebd7d1b "fastlane" should now work with remote adding as well. Michael Vogel 2015-04-09 00:33:45 +02:00
  • f6ea872986 The behaviour when following a new contact is now unified. Michael Vogel 2015-04-09 00:10:21 +02:00
  • e955f013ca Merge pull request #1502 from tobiasd/20150408_de Michael Vogel 2015-04-08 19:17:33 +02:00
  • f0021a1f72 Capitalization of addresses, linguistic style Frank Dieckmann 2015-04-08 12:12:16 +02:00
  • 4ad52a417a DE update to the strings Tobias Diekershoff 2015-04-08 12:06:05 +02:00
  • 3195157b2e Merge pull request #1499 from tobiasd/20150407_lng Michael Vogel 2015-04-07 19:08:30 +02:00
  • 5ceb8e76fd Merge pull request #1498 from ddorian1/develop Michael Vogel 2015-04-07 15:24:12 +02:00
  • 107b495183 fix infinite scrolling with frost-mobile Johannes Schwab 2015-04-07 13:26:09 +02:00
  • 7ecc401b5c FR update of the strings Tobias Diekershoff 2015-04-07 09:07:04 +02:00
  • 52549dae7b CS update to the strings Tobias Diekershoff 2015-04-07 09:00:12 +02:00
  • 9b6922fa86 Merge pull request #1497 from tobiasd/20150407_HF_1460 fabrixxm 2015-04-07 08:07:54 +02:00
  • 42ec9ad279 after pull 1460 all notifications got marked read Tobias Diekershoff 2015-04-07 07:47:15 +02:00
  • 73248f7dda allow to update generic subsets of tables fabrixxm 2015-03-31 10:21:29 +02:00
  • 11a83b2345 add new api dfrn/remoteauth allow 'user@server' as username in api_login() fabrixxm 2015-03-15 21:19:29 +01:00
  • 3355d00082 Merge pull request #1486 from annando/1504-like-on-comment Tobias Diekershoff 2015-04-06 14:09:53 +02:00
  • 539a93b3f1 The timestamp was at the wrong place Michael Vogel 2015-04-06 13:49:57 +02:00
  • 5e2c93e80c Merge remote-tracking branch 'upstream/develop' into 1503-load-issues Michael Vogel 2015-04-06 13:30:22 +02:00
  • 1048be1dd0 Liking of "red" comments is now possible. Michael Vogel 2015-04-06 13:22:19 +02:00
  • 81901f39e5 Merge pull request #1484 from annando/1504-bugfix-sql-warning Tobias Diekershoff 2015-04-06 12:56:03 +02:00
  • 95c58e59d3 Merge pull request #1485 from annando/1504-diaspora-plink Tobias Diekershoff 2015-04-06 12:55:38 +02:00
  • 4768c6c6b6 Diaspora: Central "plink" function Michael Vogel 2015-04-06 12:26:31 +02:00
  • 739219278b Avoid SQL warnings because of empty id list. Michael Vogel 2015-04-06 10:12:37 +02:00
  • fa948df062 Merge pull request #1483 from annando/1504-api-upload-pictures Tobias Diekershoff 2015-04-06 07:23:42 +02:00
  • 3cbd72d907 API: New picture upload function (Enhanced Twidere support) Michael Vogel 2015-04-06 03:19:12 +02:00
  • 8ae90035f4 Merge pull request #1480 from annando/1504-diaspora-enhancement Tobias Diekershoff 2015-04-05 21:24:21 +02:00
  • 040976c77f Merge pull request #1481 from annando/1504-new-share-function Tobias Diekershoff 2015-04-05 21:21:14 +02:00
  • cdebdc777e Removed test logger Michael Vogel 2015-04-05 21:06:32 +02:00
  • 32206cd681 Diaspora uses this to fetch single public items. Michael Vogel 2015-04-05 20:50:15 +02:00
  • 57528cb987 New function for building the "share" header Michael Vogel 2015-04-05 20:43:06 +02:00
  • aea83f0bec The order for the page parsing is changed. Michael Vogel 2015-04-05 20:40:31 +02:00
  • 8bdb026745 Merge remote-tracking branch 'upstream/master' Michael Vogel 2015-04-05 20:30:38 +02:00
  • a4afebb796 Merge pull request #1477 from dc5ala/master Tobias Diekershoff 2015-04-05 14:51:48 +02:00
  • d5fbe3a7b6 fixes a few typos André Lohan 2015-04-05 13:20:15 +02:00
  • 106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop Tobias Diekershoff 2015-04-05 11:37:05 +02:00
  • a91a352089 Merge branch 'release/3.4' into develop fabrixxm 2015-04-05 11:07:22 +02:00
  • bf28cc0f75 Merge branch 'release/3.4' fabrixxm 2015-04-05 11:05:30 +02:00
  • 9fda2d4d3b Merge pull request #1476 from fabrixxm/changelog Michael Vogel 2015-04-05 10:38:49 +02:00
  • b00fe54b05 update CHANGELOG fabrixxm 2015-04-05 10:30:57 +02:00
  • ab5540e1f0 Merge pull request #1474 from fabrixxm/silke-helptext fabrixxm 2015-04-05 10:23:19 +02:00
  • 2d3437daa3 different help text for different network fabrixxm 2015-04-04 18:02:26 +02:00
  • bb7406643b Merge branch 'helptext' of https://github.com/silke/friendica into silke-helptext fabrixxm 2015-04-04 17:42:23 +02:00
  • 4771fc16a9 Merge pull request #1473 from tobiasd/20150403doc Michael Vogel 2015-04-03 22:10:33 +02:00
  • e8df044080 small changes to the developer intro doc Tobias Diekershoff 2015-04-03 19:47:14 +02:00
  • 1523aecebd Merge pull request #1472 from annando/issue-1063 fabrixxm 2015-04-03 15:07:56 +02:00
  • e9a2cf7a91 The unseen marker is now set according to the query that is used for the home timeline. Michael Vogel 2015-04-03 14:58:42 +02:00
  • d0b925f95f Merge pull request #1471 from annando/markdown-shared-posts fabrixxm 2015-04-03 13:56:27 +02:00
  • 796b13673d Reshared posts weren't always recognized as such. Michael Vogel 2015-04-03 13:06:19 +02:00
  • 7c0c56d20b The conversion of Repeated posts to markdown had a problem with a missing linefeed before the quote. Michael Vogel 2015-04-03 12:37:29 +02:00
  • 1cacf64724 Merge pull request #1469 from fabrixxm/changelog Michael Vogel 2015-04-02 23:14:40 +02:00
  • 84ed4ef82f Update CHANGELOG fabrixxm 2015-04-02 22:18:59 +02:00
  • 341622b484 Merge pull request #1468 from tobiasd/20150402lng fabrixxm 2015-04-02 22:17:35 +02:00
  • c1d683b5b7 Merge pull request #1467 from annando/issue-1306 fabrixxm 2015-04-02 22:17:12 +02:00
  • f93e9751b8 Update codename and CHANGELOG fabrixxm 2015-04-02 22:05:52 +02:00
  • 415960a31a DE update to the strings Tobias Diekershoff 2015-04-02 21:34:59 +02:00
  • 33952e5f1d DE update to the strings Tobias Diekershoff 2015-04-02 18:23:27 +02:00
  • 97244fa487 Now past events aren't shown at any circumstance. Michael Vogel 2015-04-01 23:11:18 +02:00
  • 25299f0604 Events from the past aren't shown anymore (hopefully) Michael Vogel 2015-04-01 22:25:53 +02:00
  • c05f95b54e Improved help text, issue 1349. Silke Meyer 2015-04-01 10:10:00 +02:00
  • 1ccbf39799 Merge pull request #1461 from fabrixxm/issue-1459 Michael Vogel 2015-04-01 07:52:20 +02:00
  • 0226258e7b Block settings page for unauthorized users fabrixxm 2015-03-31 10:24:23 +02:00
  • 6b47e1b7e3 Merge pull request #1456 from tobiasd/20150330lng fabrixxm 2015-03-31 10:16:59 +02:00
  • 94cad338af Merge pull request #1458 from annando/issue-1038 Tobias Diekershoff 2015-03-31 07:35:12 +02:00
  • f054dbfc8d Feature for desktop-notifications FlxAlbroscheit 2015-03-31 02:11:46 +02:00
  • d2261397d9 Feature for desktop-notifications FlxAlbroscheit 2015-03-31 02:10:36 +02:00
  • 001e940c6c Feature for desktop-notifications FlxAlbroscheit 2015-03-31 02:06:07 +02:00
  • c3f3a239f4 Issue 1038: Send update to directory when account is removed. Michael Vogel 2015-03-30 22:22:11 +02:00
  • 0309c481a3 updating the core translation Tobias Diekershoff 2015-03-30 09:21:01 +02:00
  • 58ac6bde09 Merge pull request #1455 from pztrn/master Tobias Diekershoff 2015-03-29 16:05:57 +02:00
  • bcf7ade40d Typo Stanislav N. 2015-03-29 17:01:51 +05:00
  • 6e27510173 Do not try to create itemcache directory if it already exist. Stanislav N. 2015-03-29 16:56:26 +05:00
  • 1a62a6ca92 Merge pull request #1453 from annando/ddos-with-gprobe Tobias Diekershoff 2015-03-28 09:12:24 +01:00
  • 51cd55c8ad Some more logging added for the DDoS prevention Michael Vogel 2015-03-28 08:49:24 +01:00
  • 0206f447e1 Preventing a DDoS with the zrl parameter. Michael Vogel 2015-03-28 08:29:01 +01:00
  • 47accd71f7 Merge pull request #1450 from StefOfficiel/patch-2 Tobias Diekershoff 2015-03-27 07:21:15 +01:00
  • f56a025aff Update jquery.js StefOfficiel 2015-03-26 23:55:32 +01:00
  • dbb164ca4a Merge pull request #1449 from fabrixxm/issue-1370 Michael Vogel 2015-03-25 22:02:50 +01:00
  • c42d6b133e Merge pull request #1448 from annando/issue1432 fabrixxm 2015-03-25 11:13:50 +01:00
  • 7c33c9cca1 fix SQL generation, update database.sql fabrixxm 2015-03-25 10:03:17 +01:00
  • b2b1de5a01 Create database.sql from include\dbstructure.php add two commands to dbstructure.php when called from cli: 'update' updates the database schema 'dumpsql' dump database sql to stdout fabrixxm 2015-03-25 09:47:59 +01:00
  • 25dbf26345 Removed the special detection for facebook and app.net since both provide RSS feeds. Michael Vogel 2015-03-24 23:08:46 +01:00
  • f1c6d6f1ba Merge pull request #1442 from fabrixxm/issue-1362 Michael Vogel 2015-03-24 12:34:31 +01:00
  • 3d297c065e Merge pull request #1444 from fabrixxm/issue-1341 Michael Vogel 2015-03-23 15:19:35 +01:00
  • 8b5d9c32a7 Merge pull request #1446 from annando/issue-905 fabrixxm 2015-03-23 12:06:46 +01:00
  • 63f0177a64 Merge pull request #1443 from fabrixxm/issue-1437 Michael Vogel 2015-03-23 06:21:25 +01:00
  • 045c78e4a0 Merge pull request #1445 from fabrixxm/issue-1041 Michael Vogel 2015-03-22 22:22:49 +01:00
  • b40f19262a Diaspora: The signature of likes are checked now correctly. enter the commit message for your changes. Lines starting Michael Vogel 2015-03-22 21:53:13 +01:00
  • a98d2ee387 ignore tags inside code block should fix issue #1041 fabrixxm 2015-03-22 17:12:51 +01:00
  • add3411542 fix paginate url pagination url wasn't alway stripping 'page' parameter from url related to issue #1341 fabrixxm 2015-03-22 16:38:05 +01:00
  • e016db8bc6 Version bump, 3.4.0 Beanow 2015-03-22 15:25:31 +01:00
  • b5b597221f Merge branch 'develop' of github.com:friendica/friendica into develop Beanow 2015-03-22 15:13:30 +01:00
  • 250b466ed3 Fix blank reponse if no siteinfo are fetched fabrixxm 2015-03-22 11:03:46 +01:00