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

Commit Graph

  • a66e9b81ba Merge pull request #4873 from astifter/develop Hypolite Petovan 2018-04-23 10:23:21 -04:00
  • 2f024a3a6d Merge pull request #4913 from tobiasd/20180423-phpunit Hypolite Petovan 2018-04-23 08:00:13 -04:00
  • 2f6a898b62 Merge pull request #4916 from M-arcus/patch-5 Tobias Diekershoff 2018-04-23 13:49:24 +02:00
  • ba35b19af6 Public federated items now always are having an entry with "uid=0" Michael 2018-04-23 11:14:25 +00:00
  • 78a974ad41 [DOCS] Installation: Fix multiple sentences Marcus Müller 2018-04-23 12:24:47 +02:00
  • 70d11d377b [DOCS] Installation: Fix title Marcus Müller 2018-04-23 12:22:39 +02:00
  • c66c09d5fd Merge pull request #4914 from AndyHee/doc20180423 Tobias Diekershoff 2018-04-23 12:03:28 +02:00
  • 6599898774 [DOCS] Account docs: Fix titles Marcus Müller 2018-04-23 11:45:44 +02:00
  • 3ac43f73c3 Update Profiles.md Andy H3 2018-04-23 16:43:52 +07:00
  • bcc298204e use strlen instead of count(php7.2 fails) Tobias Diekershoff 2018-04-23 09:37:56 +02:00
  • 6e313736f4 remove comment Tobias Diekershoff 2018-04-23 09:37:06 +02:00
  • f1535c0f01 use strlen instead of count as above (php7.2 fails) Tobias Diekershoff 2018-04-23 09:35:12 +02:00
  • 61a380975b there are more then 1 test ATM Tobias Diekershoff 2018-04-23 08:53:46 +02:00
  • c31a54175d comment out use clause Tobias Diekershoff 2018-04-23 08:47:42 +02:00
  • 0a58637ace phpunit compat 5.6 vs 7.x Tobias Diekershoff 2018-04-23 08:42:13 +02:00
  • a25c07b162 Merge pull request #4912 from annando/archivecontacts Hypolite Petovan 2018-04-23 02:07:53 -04:00
  • b3d24f0ff2 DFRN: mark for archival at different places Michael 2018-04-23 06:03:55 +00:00
  • aa6584684e Merge pull request #4911 from tobiasd/20180423-travis Hypolite Petovan 2018-04-23 01:49:16 -04:00
  • 125f0df473 travix indentation Tobias Diekershoff 2018-04-23 07:42:48 +02:00
  • 866fbb4d80 Added console command to manually archive contacts Michael 2018-04-23 05:33:47 +00:00
  • 3f3456efde Merge pull request #4910 from tobiasd/20180423-lng Hypolite Petovan 2018-04-23 01:32:15 -04:00
  • 82bf2d984e update DE translations Tobias Diekershoff 2018-04-23 07:13:10 +02:00
  • fa38089a95 update FI translations THX Kris Tobias Diekershoff 2018-04-23 07:13:02 +02:00
  • b1a668a3ea Merge pull request #4909 from MrPetovan/bug/4898-fix-php-72-warnings Michael Vogel 2018-04-23 06:50:21 +02:00
  • 00985fe340 Fix self warning in Util\Temporal Hypolite Petovan 2018-04-23 00:03:27 -04:00
  • 9b052b5ea8 Fix count() warning in Object\Post Hypolite Petovan 2018-04-23 00:02:18 -04:00
  • b0564ea40d Fix count() warning in Model\Profile Hypolite Petovan 2018-04-23 00:01:46 -04:00
  • da4892b4d2 Fix count() warning in mod/friendica Hypolite Petovan 2018-04-23 00:00:29 -04:00
  • a84477ed2d Fix count() warning in include/dba.php Hypolite Petovan 2018-04-23 00:00:06 -04:00
  • 0ff51c2b13 Merge pull request #4908 from rabuzarus/20180421_frio_some_missing_admin_templates Michael Vogel 2018-04-23 00:32:52 +02:00
  • 37e5272f92 Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext Michael Vogel 2018-04-23 00:26:05 +02:00
  • 763b061a2b frio - Bugfix - there was a wrong user count in admin-users template rabuzarus 2018-04-23 00:26:00 +02:00
  • 4e9236e9e9 Merge pull request #4907 from rabuzarus/20180421_frio_some_missing_admin_templates Hypolite Petovan 2018-04-22 18:14:50 -04:00
  • 12e7b6c3c8 Merge pull request #4906 from MrPetovan/task/content-filter-one-liner rabuzarus 2018-04-23 00:14:22 +02:00
  • 087bfbc6a7 Forgot new line at end of file in templates/wall/content_filter.tpl Hypolite Petovan 2018-04-22 18:13:13 -04:00
  • 48122733b8 Move content filter HTML in a template Hypolite Petovan 2018-04-22 18:02:00 -04:00
  • 04bdba0d78 frio - some work on the admin contactblock template to be more consistant with other setting pages rabuzarus 2018-04-22 23:06:06 +02:00
  • 76fdf5c910 Merge pull request #4905 from MrPetovan/task/content-filter-one-liner rabuzarus 2018-04-22 23:00:05 +02:00
  • da24e282c6 Updated credits.txt. Andreas Neustifter 2018-04-19 21:24:23 +00:00
  • 390983a331 Haromonize Find People Widget. Friendica 2018-04-19 20:54:14 +00:00
  • 666375fed1 Move new member tips to tab bar. Friendica 2018-04-19 20:09:19 +00:00
  • 54cfbe039b Only shown pagination when not empty. Friendica 2018-04-19 19:47:12 +00:00
  • 226d90ad5a Image in /contacts/xx is shifted. Friendica 2018-04-19 19:49:58 +00:00
  • 4cfb12e9d9 Add one-line content filter when there's only one reason Hypolite Petovan 2018-04-22 14:28:34 -04:00
  • 5a82ee04bc frio - some work on the admin users template to be more consistant with other setting pages rabuzarus 2018-04-22 20:23:24 +02:00
  • 1585b5db45 Merge pull request #4904 from M-arcus/patch-4 Hypolite Petovan 2018-04-22 13:30:28 -04:00
  • 74db460274 [DOCS] Install: Add intendation for list (en) Marcus Müller 2018-04-22 19:28:27 +02:00
  • f62531fef8 [DOCS] Install: Add intendation for list (de) Marcus Müller 2018-04-22 19:27:56 +02:00
  • b7410f6866 [DOCS] Installation: Fix minor text error Marcus Müller 2018-04-22 19:11:37 +02:00
  • f6a76f4f8f [DOCS] Installation: Update german instructions Marcus Müller 2018-04-22 19:10:27 +02:00
  • ad95099948 [DOCS] Automatic install: Add documentation Marcus Müller 2018-04-22 17:55:43 +02:00
  • d977ff78df Uncomment some code in ItemContent::getPlaintextPost Hypolite Petovan 2018-04-22 11:43:27 -04:00
  • 6e9ed3f01b Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence Michael Vogel 2018-04-22 17:38:32 +02:00
  • 7f93d5c74b Merge pull request #4903 from MrPetovan/bug/infinite-loop-in-dba-delete rabuzarus 2018-04-22 17:35:52 +02:00
  • 952b057631 Merge pull request #4900 from annando/dfrn-rework Hypolite Petovan 2018-04-22 11:35:41 -04:00
  • 273dde508b Add default value doc for options.cascade in dba::delete Hypolite Petovan 2018-04-22 11:34:41 -04:00
  • 0a026515bd Add documentation for $options parameter in dba::delete Hypolite Petovan 2018-04-22 11:33:20 -04:00
  • 82ed6fff9f Use public_contact() instead of wrong query in Profile::getEventsReminderHTML Hypolite Petovan 2018-04-22 11:29:55 -04:00
  • 6b9706c558 Merge pull request #4901 from tobiasd/20180422-travis Hypolite Petovan 2018-04-22 11:17:06 -04:00
  • 34a24711a3 check more PHP version Tobias Diekershoff 2018-04-22 14:56:59 +02:00
  • 98c677f09f Currently disabled Michael 2018-04-22 11:33:32 +00:00
  • 8f2db61538 Receiving of public posts is now working Michael 2018-04-22 10:58:03 +00:00
  • b77ae3a8a7 Public posts are now transferred successfully to the DFRN part Michael 2018-04-22 10:42:01 +00:00
  • ea4e9b2cce Merge pull request #4896 from MrPetovan/bug/infinite-loop-in-dba-delete Tobias Diekershoff 2018-04-22 12:23:11 +02:00
  • bfe1dd08c2 Merge pull request #4897 from MrPetovan/bug/4879-remove-backslash-in-birthday-events Tobias Diekershoff 2018-04-22 12:18:48 +02:00
  • c59b28a8c4 create public endpoint Michael 2018-04-22 10:04:30 +00:00
  • c4aa925793 Update messages.po after changing a translation string Hypolite Petovan 2018-04-22 05:17:42 -04:00
  • ba3f721524 Prevent side effect with cascade => false in dba::delete Hypolite Petovan 2018-04-22 04:46:46 -04:00
  • e0b33b36a2 Decrease scope of query in Profile::getEventsReminderHTML Hypolite Petovan 2018-04-22 04:41:53 -04:00
  • c118c03a70 Merge remote-tracking branch 'upstream/develop' into dfrn-rework Michael 2018-04-22 07:45:28 +00:00
  • f70f0ac266 Merge pull request #4895 from tobiasd/20180422-fi Michael Vogel 2018-04-22 09:35:42 +02:00
  • c44df2ae94 update FI translations THX Kris Tobias Diekershoff 2018-04-22 08:28:53 +02:00
  • 25662eb6f4 Merge pull request #4892 from MrPetovan/bug/infinite-loop-in-dba-delete Michael Vogel 2018-04-22 07:55:39 +02:00
  • 39edd086e0 Merge pull request #4893 from MrPetovan/bug/4879-remove-backslash-in-birthday-events Michael Vogel 2018-04-22 07:54:07 +02:00
  • 08afec3170 Only show event reminders of events attendyes or attendmaybe Hypolite Petovan 2018-04-21 22:49:06 -04:00
  • 851c5d841f Fix quoting style in DFRN::birthdayEvent() Hypolite Petovan 2018-04-21 21:03:12 -04:00
  • 6d88984ee5 Move Model\Item::getPlaintextPost to Model\ItemContent::getPlaintextPost Hypolite Petovan 2018-04-21 20:50:13 -04:00
  • 18078ce7a4 Prevent infinite loop when a dbstructure_definition hook is orphan Hypolite Petovan 2018-04-21 20:34:07 -04:00
  • ee672b946e Add Text\BBCode::toPlaintext to mod/babel Hypolite Petovan 2018-04-21 18:48:10 -04:00
  • daf94a8f63 Merge pull request #4891 from annando/private-forum-redux Hypolite Petovan 2018-04-21 18:19:27 -04:00
  • 16beab4652 Better working with private forums Michael 2018-04-21 21:59:02 +00:00
  • 5dda815521 Merge pull request #4887 from rabuzarus/20180421_-_frio_add_missing_settings_css Tobias Diekershoff 2018-04-21 16:29:27 +02:00
  • 0700452c49 Merge pull request #4888 from friendica/revert-4883-install_config Tobias Diekershoff 2018-04-21 16:28:51 +02:00
  • f63be91bd5 Revert "Moved .htconfig.php file & extracted Install business logic" Tobias Diekershoff 2018-04-21 16:28:22 +02:00
  • 7e41f62809 frio - add missing page styles for user setting pages rabuzarus 2018-04-21 16:22:11 +02:00
  • afced187bc Merge pull request #4885 from rabuzarus/20180421_-_fix_frio_in_directory Hypolite Petovan 2018-04-21 10:10:32 -04:00
  • 8f6e018958 frio - remove $baseurl variable from default template because we don't need it anymore rabuzarus 2018-04-21 16:04:11 +02:00
  • 401934f21f Merge pull request #4883 from nupplaphil/install_config Hypolite Petovan 2018-04-21 09:59:57 -04:00
  • d08ddaa116 Merge pull request #4884 from rabuzarus/20180421_-_fix_image_upload_for_msg Hypolite Petovan 2018-04-21 09:58:54 -04:00
  • a65e93faea frio - fix default template if friendica is installed into a subdirectory rabuzarus 2018-04-21 15:43:11 +02:00
  • 54c3efccab frio - don't show the "insert image" button in modals (because it doesn't work at the current state) rabuzarus 2018-04-21 14:27:57 +02:00
  • 334d392154 Merge remote-tracking branch 'origin/develop' into install_config Philipp Holzer 2018-04-21 14:23:49 +02:00
  • 346697d771 Moved .htconfig file Philipp Holzer 2018-04-21 14:10:53 +02:00
  • 4285cd5dc7 frio - fix image upload for prv messages rabuzarus 2018-04-21 14:05:40 +02:00
  • ebe203336f Merge pull request #4882 from annando/private-forums Tobias Diekershoff 2018-04-21 13:54:10 +02:00
  • fd7658a70a Contact requests from Diaspora for private forums aren't accepted automatically anymore Michael 2018-04-21 10:39:46 +00:00
  • e61ed380f7 Reworked dfrn_notify endpoint, added public endpoint Michael 2018-04-21 09:55:41 +00:00
  • 1e67c32142 Fix BBCode::getAbstract scope Hypolite Petovan 2018-04-21 04:38:27 -04:00
  • abc50eb3ae Improve Model\Item::addLanguageInPostopts() Hypolite Petovan 2018-04-21 04:11:32 -04:00
  • ec9baef968 Add new Content\BBCode::toPlaintext() Hypolite Petovan 2018-04-21 04:10:25 -04:00