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

Commit Graph

  • d71e856535 Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE Hypolite Petovan 2018-11-21 23:53:45 -05:00
  • c91a87bc07 Fix typo in comment in mod/redir Hypolite Petovan 2018-11-21 22:27:57 -05:00
  • 20e7e7e3ac Add new REGISTER_INVITATION value to mod/friendica output Hypolite Petovan 2018-11-21 22:27:28 -05:00
  • 62f09fdd57 Only store last opened panel for one reload (the POST reload after a submit) Jonny Tischbein 2018-11-21 19:23:06 +01:00
  • 278d42dbc9 Save last collapsed panel + restore to open and scroll to top of panel Jonny Tischbein 2018-11-21 19:15:59 +01:00
  • cf1c63fcc2 Merge pull request #6176 from annando/ap-security Tobias Diekershoff 2018-11-21 18:10:45 +01:00
  • 860b7bad73 Frio: Add collapsable panel-groups for admin/site Jonny Tischbein 2018-11-21 17:27:10 +01:00
  • 2ef23300a3 Merge pull request #6179 from Alkarex/sql-distinct-fix Hypolite Petovan 2018-11-21 08:07:33 -05:00
  • 117c0f6c13 Merge pull request #6178 from annando/ap-viewcontacts Hypolite Petovan 2018-11-21 08:06:54 -05:00
  • a25df1a9c1 Merge pull request #6177 from annando/oembed-escaping Hypolite Petovan 2018-11-21 08:06:26 -05:00
  • a1238d03a6 Fix SQL grammar error: ORDER BY clause is not in SELECT Alexandre Alapetite 2018-11-21 09:57:34 +01:00
  • 85529ed8ff "viewcontacts" hadn't displayed the AP contacts Michael 2018-11-21 08:50:43 +00:00
  • aa1882fd99 Sanitize the OEmbed data before processing it Michael 2018-11-21 07:07:24 +00:00
  • 27d1da0468 One space too much Michael 2018-11-20 20:49:06 +00:00
  • 5c39779b45 AP: Security check against forged "create" activities Michael 2018-11-20 20:40:47 +00:00
  • a76c00de66 Merge pull request #6171 from JonnyTischbein/issue_worker_free_mem Hypolite Petovan 2018-11-19 21:40:46 -05:00
  • 9aea59d4e3 Change Worker to use only MemFree in isMinMemoryReached Jonny Tischbein 2018-11-19 23:21:40 +01:00
  • 956fe99591 Merge pull request #6170 from annando/safe-save Hypolite Petovan 2018-11-19 11:51:39 -05:00
  • 70e68449ff Merge pull request #6169 from AndyHee/develop Hypolite Petovan 2018-11-19 11:41:49 -05:00
  • 612e4c4138 Update FAQ.md Andy H3 2018-11-19 23:37:35 +07:00
  • d89e3f4264 To safe or not so save, that is the question Michael 2018-11-19 16:36:31 +00:00
  • bb767dda51 Update sample-nginx.config Andy H3 2018-11-19 23:31:54 +07:00
  • 80a990a7d5 Update sample-nginx.config Andy H3 2018-11-19 23:26:34 +07:00
  • 735cb7c6c1 Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2018-11-19 21:54:56 +07:00
  • 6da7d89a09 Merge pull request #6166 from annando/dbclean Tobias Diekershoff 2018-11-19 12:01:11 +01:00
  • b486e48cd6 14 days Michael 2018-11-19 10:02:44 +00:00
  • ad3502078f Merge remote-tracking branch 'upstream/develop' into dbclean Michael 2018-11-19 10:01:09 +00:00
  • ef1813b88e Merge pull request #6165 from annando/default-features Tobias Diekershoff 2018-11-19 10:34:51 +01:00
  • 191c1a400a The expiry of conversations can now be configured in the admin panel Michael 2018-11-19 06:58:46 +00:00
  • 503c78e3ef Another try to make tests run again Michael 2018-11-18 20:59:40 +00:00
  • 68936e8fc0 Possibly fix test Michael 2018-11-18 20:40:10 +00:00
  • 43079bfaf8 Several default features are now in the core Michael 2018-11-18 20:13:46 +00:00
  • e17dc56af9 Merge pull request #6163 from hoergen/socke Tobias Diekershoff 2018-11-18 14:11:40 +01:00
  • 6153fd552b added linebreak and markdown url hoergen 2018-11-18 14:05:46 +01:00
  • 75398b96d5 Merge pull request #6164 from annando/network-protocols Hypolite Petovan 2018-11-18 07:47:10 -05:00
  • 0ad71ebbbc Networks are now protocols Michael 2018-11-18 12:44:01 +00:00
  • e086f05aa4 Merge pull request #6162 from JonnyTischbein/issue_delete_comment_from_guid Tobias Diekershoff 2018-11-18 13:34:51 +01:00
  • a3fd0e4f7a [Doc]removed bold from keyword hoergen 2018-11-18 13:13:07 +01:00
  • ad07525a9f Rearranged and wrote some parts new and more coherent. hoergen 2018-11-18 12:50:23 +01:00
  • a36a780b99 Add fallback if comment as no parent Jonny Tischbein 2018-11-18 12:46:21 +01:00
  • 5d464c353f Delete comment from its guid and return to parent guid Jonny Tischbein 2018-11-18 12:43:26 +01:00
  • 9dfc970bd6 Merge pull request #6144 from Alkarex/ATOM-self Michael Vogel 2018-11-18 12:31:15 +01:00
  • db441ca1ce Merge remote-tracking branch 'upstream/develop' into develop AndyHee 2018-11-18 10:44:32 +07:00
  • 2456a66597 Merge pull request #6160 from annando/item-delete Hypolite Petovan 2018-11-17 19:27:12 -05:00
  • e2ea4a3dc3 Allow to delete every post, even public ones Michael 2018-11-17 22:56:28 +00:00
  • a0589676e8 Merge pull request #6159 from JonnyTischbein/issue_photo_permisson_upload_to_album Hypolite Petovan 2018-11-17 14:13:32 -05:00
  • 807afa3059 Merge pull request #6158 from tobiasd/20181117-contactedittab Hypolite Petovan 2018-11-17 14:12:30 -05:00
  • 7c690c93bb Fix setting permisson as post for uploaded photo in album via modal create post Jonny Tischbein 2018-11-17 19:14:59 +01:00
  • 6be831fd32 Add link to user groups from /contact Tobias Diekershoff 2018-11-17 18:33:12 +01:00
  • 22fedc9a1a Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder Hypolite Petovan 2018-11-17 11:59:24 -05:00
  • e11f9d5a8e Merge pull request #6156 from tobiasd/20181117-vagrantsql Hypolite Petovan 2018-11-17 11:37:22 -05:00
  • 381474f314 Merge pull request #6155 from fabrixxm/issues/localredirect Tobias Diekershoff 2018-11-17 17:36:04 +01:00
  • 590fbe8c6f More Code Standard Jonny Tischbein 2018-11-17 17:27:12 +01:00
  • 4f8e50d834 Code Standard Jonny Tischbein 2018-11-17 17:24:30 +01:00
  • 0780dccf4f recreated SQL file for Vagrant VM from current DB structure Tobias Diekershoff 2018-11-17 16:25:51 +01:00
  • 1e9e06a325 Use appropriate redirect in dfrn_poll fabrixxm 2018-11-17 16:12:45 +01:00
  • 458b0f3545 Change how to decide between empty update and not called field file Jonny Tischbein 2018-11-17 16:04:54 +01:00
  • f5d58d07e1 Merge pull request #6154 from JonnyTischbein/issue_open_commentbox_post_with_replies Hypolite Petovan 2018-11-17 10:01:05 -05:00
  • ce82f5cec9 Merge pull request #6147 from Alkarex/stylesheet-path-html-encoding Hypolite Petovan 2018-11-17 09:55:26 -05:00
  • 9c2ba6abe9 Merge pull request #6153 from JonnyTischbein/issue_return_delete_comments Hypolite Petovan 2018-11-17 09:54:47 -05:00
  • dd7d556c86 Fix opening comment box when Post has replies Jonny Tischbein 2018-11-17 15:53:34 +01:00
  • 4d092872a5 Escaping moved to template Alexandre Alapetite 2018-11-17 14:01:07 +01:00
  • cf9c3444bc Fix return url when delete comment from display Jonny Tischbein 2018-11-17 13:56:58 +01:00
  • 56406b9910 Fix SQL Error if no items where found + Fix setting to null Jonny Tischbein 2018-11-17 13:22:32 +01:00
  • 9e25270699 Merge pull request #6145 from Alkarex/ATOM-title-encoding Hypolite Petovan 2018-11-17 07:01:53 -05:00
  • 3e1e2d3071 Merge pull request #6146 from Alkarex/atom-link-title-dfrn Hypolite Petovan 2018-11-17 06:50:09 -05:00
  • 02aa11fb7a Merge pull request #6143 from tobiasd/20181116-Vagranthtaccess Hypolite Petovan 2018-11-17 06:49:40 -05:00
  • 52eb2281e4 Fix deleting last element from saved folder + Fix displaying empty saved folder Jonny Tischbein 2018-11-17 12:41:00 +01:00
  • c66650f7d8 Merge pull request #6151 from fabrixxm/issues/6119 Michael Vogel 2018-11-17 12:31:08 +01:00
  • c13e078c42 dbstructure: check for comment value or use default fabrixxm 2018-11-17 11:43:01 +01:00
  • bd19e93c09 Minor code relocation Alexandre Alapetite 2018-11-17 01:36:54 +01:00
  • dd65c5d150 Apply correct title encoding to all cases Alexandre Alapetite 2018-11-17 01:30:53 +01:00
  • e45d32d5a5 Fix lack of HTML encoding for stylesheet link Alexandre Alapetite 2018-11-17 00:23:59 +01:00
  • b190c2e9c7 Title difference for two different ATOM feeds Alexandre Alapetite 2018-11-17 00:05:13 +01:00
  • af38d22d38 Fix ATOM feed title encoding Alexandre Alapetite 2018-11-16 23:52:36 +01:00
  • d85e26d314 Refactor header with feed_mode Alexandre Alapetite 2018-11-16 23:29:26 +01:00
  • d81366bff4 cp htaccess in Vagrant VM on setup Tobias Diekershoff 2018-11-16 23:09:54 +01:00
  • 460c257cb4 Merge pull request #6142 from annando/databasesql Tobias Diekershoff 2018-11-16 21:28:38 +01:00
  • 7b7ce91126 Merge pull request #6141 from tobiasd/20181116_lang Michael Vogel 2018-11-16 21:25:52 +01:00
  • 6aef4aea0e Updated database.sql Michael 2018-11-16 20:21:33 +00:00
  • 31d9be8337 CS, FR, PL translation updates Tobias Diekershoff 2018-11-16 20:08:31 +01:00
  • 97d164f69e Correct self attribute in ATOM feeds Alexandre Alapetite 2018-11-16 18:54:06 +01:00
  • 58e35f037b Merge pull request #6136 from annando/delete-locally Hypolite Petovan 2018-11-15 18:26:12 -05:00
  • b7ed5454c9 Merge pull request #6139 from annando/feed-mode Hypolite Petovan 2018-11-15 18:21:05 -05:00
  • c3b6727fad Some more feed simplification Michael 2018-11-15 16:21:37 +00:00
  • 779612d4a8 Merge pull request #6138 from annando/feed-mode Hypolite Petovan 2018-11-15 09:16:08 -05:00
  • 5eb8929f0c Merge pull request #6137 from Alkarex/WebSub_fixes Hypolite Petovan 2018-11-15 09:13:59 -05:00
  • 5f258dac22 Make feeds look more like feeds Michael 2018-11-15 13:21:58 +00:00
  • 51f0d52100 WebSub fixes Alexandre Alapetite 2018-11-15 12:54:04 +01:00
  • 6ad082a710 Improved delete text to clarify AP comment delete behaviour Michael 2018-11-15 06:36:06 +00:00
  • 921094017c Merge pull request #6134 from annando/6128-again Tobias Diekershoff 2018-11-15 06:19:13 +01:00
  • 08433873f5 Issue 6128 again: We now use our regular feed that allows anonymous polling Michael 2018-11-14 19:26:23 +00:00
  • 4894e89f03 Merge pull request #6132 from annando/notice Hypolite Petovan 2018-11-14 09:46:57 -05:00
  • 268862dd7c Just some notice again Michael 2018-11-14 10:54:42 +00:00
  • 89cc79b77b Merge pull request #6131 from annando/diaspora-relocation Tobias Diekershoff 2018-11-14 10:27:25 +01:00
  • b0d8a2fcd0 Merge pull request #6127 from annando/notice Tobias Diekershoff 2018-11-14 10:20:47 +01:00
  • 88a4733e5f Forgotten "use" Michael 2018-11-14 06:00:01 +00:00
  • 9271b21d51 Create a new GUID on user import Michael 2018-11-14 05:58:03 +00:00
  • 6996a172e8 Merge pull request #6130 from annando/develop Hypolite Petovan 2018-11-13 18:46:17 -05:00
  • cf4a560c12 Merge pull request #6129 from friendica/5891-follow-up Michael Vogel 2018-11-13 23:29:01 +01:00