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

Commit Graph

  • cb612c712d Merge pull request #4237 from zeroadam/Profile-#3878 Hypolite Petovan 2018-01-15 07:32:30 -05:00
  • 5d03eb3dae Some SQL servers report different lengths for unsigned types Michael 2018-01-15 07:42:05 +00:00
  • 7473b55961 Merge pull request #4238 from tobiasd/20180115-messages Michael Vogel 2018-01-15 08:04:16 +01:00
  • cbbd7be6b3 Merge pull request #4239 from tobiasd/20180115-2018 Michael Vogel 2018-01-15 08:03:54 +01:00
  • f18d459e46 Update after comment on public post should now work on the network page Michael 2018-01-15 06:59:20 +00:00
  • b3eddc6881 Happy new year! Tobias Diekershoff 2018-01-15 07:45:12 +01:00
  • 7af564442a SQL structure had changed Michael 2018-01-15 06:43:28 +00:00
  • 628016f378 regenerated master messages.po file Tobias Diekershoff 2018-01-15 07:37:47 +01:00
  • 0e3fe14024 Merge pull request #4235 from MrPetovan/task/4116-remove-library-oauth2 Michael Vogel 2018-01-15 07:33:26 +01:00
  • 430bd7c6ac Review updates Adam Magness 2018-01-14 23:44:39 -05:00
  • 41159cd14f use Adam Magness 2018-01-14 21:41:56 -05:00
  • 0c5cc291af More use Adam Magness 2018-01-14 21:38:26 -05:00
  • 2ef8d72b60 Missing use Adam Magness 2018-01-14 21:29:19 -05:00
  • a01a8a06f2 Remove requires Adam Magness 2018-01-14 21:26:07 -05:00
  • 641ab5e247 Remove include/identity Adam Magness 2018-01-14 21:23:18 -05:00
  • 4fb2547df8 Update function calls Adam Magness 2018-01-14 21:22:39 -05:00
  • 4cfa46186a Move include/identity to src Adam Magness 2018-01-14 20:13:02 -05:00
  • 448ae08dd5 Merge pull request #4231 from MrPetovan/bug/3639-fix-diaspora-lf-in-code-blocks Michael Vogel 2018-01-15 01:37:13 +01:00
  • 04481087a9 Delete unused library/oauth2-php library Hypolite Petovan 2018-01-14 19:28:55 -05:00
  • fabbf810b0 Move library/markdown.php to src Hypolite Petovan 2018-01-14 18:59:08 -05:00
  • 903b960d4c Improve babel page display Hypolite Petovan 2018-01-14 13:13:36 -05:00
  • 503e5847f9 Improve html2bbcode Hypolite Petovan 2018-01-14 13:13:16 -05:00
  • f828afde83 Extend multi-line code blocks regular expression Hypolite Petovan 2018-01-14 13:12:29 -05:00
  • 3e56a63162 Remove library/php-markdown Hypolite Petovan 2018-01-14 10:06:12 -05:00
  • 53f3d54ad3 Add michelf/php-markdown to Composer Hypolite Petovan 2018-01-14 10:05:51 -05:00
  • a81dc7f5a8 Update Composer version Hypolite Petovan 2018-01-14 10:04:23 -05:00
  • 9babf0befd Merge pull request #4234 from annando/participation-2 Hypolite Petovan 2018-01-14 18:57:05 -05:00
  • b7022963f3 On participation send all the old content of the thread Michael 2018-01-14 22:53:00 +00:00
  • f45cde798a Merge pull request #4232 from fabrixxm/frio-login Hypolite Petovan 2018-01-14 17:22:36 -05:00
  • 64e3dbfaa4 Merge pull request #4225 from zeroadam/UserImport-#3878 Hypolite Petovan 2018-01-14 17:21:26 -05:00
  • b3c304c210 Merge pull request #4229 from annando/database Hypolite Petovan 2018-01-14 17:16:20 -05:00
  • 8be6989bd1 Review updates Adam Magness 2018-01-14 15:56:36 -05:00
  • 5392f9eb8b spaces to tabs fabrixxm 2018-01-14 21:53:37 +01:00
  • 1ecfa49f4c Merge pull request #4233 from MrPetovan/task/4116-move-smarty-to-composer Michael Vogel 2018-01-14 20:05:52 +01:00
  • de7dbdff14 Removed test output Michael 2018-01-14 19:02:27 +00:00
  • e412cd7c51 Fix formatting in include/friendica_smarty Hypolite Petovan 2018-01-14 13:36:48 -05:00
  • 03b16c449f Remove library/Smarty Hypolite Petovan 2018-01-14 13:36:27 -05:00
  • 7f44736803 Add Smarty to Composer Hypolite Petovan 2018-01-14 13:35:25 -05:00
  • de227e305e Frio: add input for login backround image in admin settings fabrixxm 2018-01-14 19:19:24 +01:00
  • 1064da1052 New home/login page style fabrixxm 2018-01-14 18:45:00 +01:00
  • 4000e81f1b Merge pull request #4223 from MrPetovan/task/fix-scrutinizer-issues Michael Vogel 2018-01-14 16:20:23 +01:00
  • 98edd826ac Increased database version Michael 2018-01-14 15:14:16 +00:00
  • fabe79a798 Reworked and unified database structure, added comments Michael 2018-01-14 15:13:00 +00:00
  • 39c036e6ba Fix implode Warning in Diaspora Hypolite Petovan 2018-01-14 09:05:06 -05:00
  • 4dafdda99e Fix Deprecated error message Hypolite Petovan 2018-01-14 09:04:46 -05:00
  • c89129ad20 Fix typo when referring to dba::exists Hypolite Petovan 2018-01-12 23:54:16 -05:00
  • c66af117b3 Fix Scrutinizer issues in contacts/credits/crepair Hypolite Petovan 2018-01-12 23:41:18 -05:00
  • adfabeadb1 Rename param to condition in dba::delete Hypolite Petovan 2018-01-12 23:35:35 -05:00
  • e3b69f97cf Fix formatting in mod/delegate Hypolite Petovan 2018-01-12 23:29:49 -05:00
  • f588adb511 Fix formatting in dfrn_confirm Hypolite Petovan 2018-01-12 23:23:51 -05:00
  • e70e48abaa constant Adam Magness 2018-01-13 13:10:14 -05:00
  • 9e81d3dc40 Attempt anonymous Adam Magness 2018-01-13 13:08:18 -05:00
  • f97752383a Merge pull request #4226 from zeroadam/Redir-#3878 Hypolite Petovan 2018-01-13 12:42:38 -05:00
  • 4e7657da99 Remove redir.php Adam Magness 2018-01-13 09:41:26 -05:00
  • 7635421d78 Update function calls Adam Magness 2018-01-13 09:40:34 -05:00
  • 771163e860 Move auto_redir function Adam Magness 2018-01-13 09:36:21 -05:00
  • 88aeddab82 Remove old file Adam Magness 2018-01-13 09:15:45 -05:00
  • c1baa5ed7d Update functions Adam Magness 2018-01-13 09:14:37 -05:00
  • f5d2b83938 Create UserImport Adam Magness 2018-01-13 09:01:32 -05:00
  • 44a2ec439e Merge pull request #4220 from annando/receive_participation Hypolite Petovan 2018-01-13 07:46:59 -05:00
  • a78cbf6174 The changed field name has to be changed here as well Michael 2018-01-13 09:19:57 +00:00
  • 915419ace3 Merge remote-tracking branch 'upstream/develop' into receive_participation Michael 2018-01-13 08:29:44 +00:00
  • 725bb9641a Merge pull request #4224 from friendica/fabrixxm-patch-api-login Michael Vogel 2018-01-13 09:28:17 +01:00
  • 2d0fe7a30f Fix api login fabrixxm 2018-01-13 09:22:40 +01:00
  • ed9c50ea2e Merge remote-tracking branch 'upstream/develop' into receive_participation Michael 2018-01-13 00:18:41 +00:00
  • 70942202c0 Merge pull request #4216 from MrPetovan/bug/4173-fix-oembed-iframe-url Michael Vogel 2018-01-13 00:45:32 +01:00
  • b638ed9e86 Corrected function name Michael 2018-01-12 23:43:08 +00:00
  • 779f6601f4 Merge pull request #4221 from annando/oembed-no-title Hypolite Petovan 2018-01-12 18:39:14 -05:00
  • 2c90c5be94 Better treatment of Oembed detection with no OEmbed data and not title Michael 2018-01-12 23:32:58 +00:00
  • 06751470ce Changed case Michael 2018-01-12 23:26:55 +00:00
  • 4c104a6cc2 Added table definition Michael 2018-01-12 23:25:30 +00:00
  • fc9453b7e9 Corrected field names Michael 2018-01-12 23:20:19 +00:00
  • 9e37b49bea copy and paste ... Michael 2018-01-12 21:02:39 +00:00
  • 3c027699a5 Receive participation messages and processes them Michael 2018-01-12 20:52:43 +00:00
  • 85eaa002a2 Merge pull request #4218 from hoergen/develop Michael Vogel 2018-01-12 08:24:32 +01:00
  • 04ffdd9ec0 Merge pull request #4217 from tobiasd/20180112-exitnano Michael Vogel 2018-01-12 08:20:51 +01:00
  • 1f8b9b68e5 Changes on popup menus hoergen 2018-01-12 08:05:51 +01:00
  • 61bdb7c1d6 sray X cauing PHP errors Tobias Diekershoff 2018-01-12 06:55:14 +01:00
  • 93355b574d Fix attachment display Hypolite Petovan 2018-01-11 22:37:38 -05:00
  • 77c1251d03 Fallback to regular attachment display on oembed error Hypolite Petovan 2018-01-11 22:34:02 -05:00
  • b01daf18c5 Fix formatting of get_attachment_data() Hypolite Petovan 2018-01-11 22:29:56 -05:00
  • 34b80227e8 Merge pull request #4215 from annando/tag-net Hypolite Petovan 2018-01-11 19:34:36 -05:00
  • 5c6ee6ea26 Merge pull request #4214 from annando/fix-silence Hypolite Petovan 2018-01-11 19:30:51 -05:00
  • 772cd6686e Merge pull request #4213 from annando/feed-information Hypolite Petovan 2018-01-11 19:29:40 -05:00
  • eee3ae9617 Only filter for hash tags on federated networks Michael 2018-01-12 00:23:45 +00:00
  • e52a2edcf4 Filtering by network type in hash tag following is now possible Michael 2018-01-12 00:14:58 +00:00
  • dfe11b1863 Silencing an account does work again Michael 2018-01-11 23:56:33 +00:00
  • 1068091bbe Add the feed link to the body when not present in the feed Michael 2018-01-11 22:57:31 +00:00
  • ef09f7f958 Merge pull request #4212 from annando/develop Hypolite Petovan 2018-01-11 17:55:45 -05:00
  • dc45bc3c84 Merge remote-tracking branch 'upstream/develop' into develop Michael 2018-01-11 22:51:53 +00:00
  • c4db9edbe1 Merge pull request #4211 from annando/develop Hypolite Petovan 2018-01-11 17:51:10 -05:00
  • c0eecfc55f Unbalanced html fixed Michael 2018-01-11 22:34:56 +00:00
  • e18e081b47 bookmark elements weren't always parsed correctly Michael 2018-01-11 22:28:46 +00:00
  • 5f229e6030 Merge pull request #4210 from annando/fix-notification Hypolite Petovan 2018-01-11 17:14:42 -05:00
  • 6f1b1aee4b Bugfix: The name of the item owner was empty in notifications Michael 2018-01-11 22:07:41 +00:00
  • d74292b7e1 Merge pull request #4209 from annando/oembed-link Hypolite Petovan 2018-01-11 16:39:25 -05:00
  • a7b2db5db9 When no OEmbedding is wanted, the links are now created fine again Michael 2018-01-11 21:31:44 +00:00
  • 91198cb53d Merge pull request #4206 from MrPetovan/task/fix-scrutinizer-issues Michael Vogel 2018-01-11 20:35:41 +01:00
  • c54a2c1e83 Merge pull request #4208 from annando/thr-parent Hypolite Petovan 2018-01-11 14:21:24 -05:00
  • 220106c90a When commenting on comments, the comment now appears again under the comment Michael 2018-01-11 19:17:40 +00:00