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

Commit Graph

  • 4b61719450 Merge pull request #3785 from tobiasd/20171013-de Michael Vogel 2017-10-13 18:26:29 +02:00
  • e091a610d7 Fixed indention level Michael 2017-10-13 16:24:38 +00:00
  • 5afab4b178 update DE translation Tobias Diekershoff 2017-10-13 18:10:08 +02:00
  • b31c6413fe Can be private Michael 2017-10-13 15:51:57 +00:00
  • 9f2196aa1a Parameter should fit ... Michael 2017-10-13 15:48:59 +00:00
  • 0a45f40c9d Diaspora: We now support the receiving of account migration messages Michael 2017-10-13 15:32:10 +00:00
  • 0882b2df97 Merge pull request #3779 from annando/event-data rabuzarus 2017-10-13 13:06:46 +02:00
  • fd81a90eb8 Merge pull request #3783 from annando/diaspora-migration Tobias Diekershoff 2017-10-13 12:59:47 +02:00
  • 9286f5cf31 Added documentation Michael 2017-10-13 10:49:51 +00:00
  • 14fe3d60ae Merge pull request #3782 from tobiasd/20171013-msg Michael Vogel 2017-10-13 11:44:27 +02:00
  • b31b29c557 Now it could work Michael 2017-10-13 09:41:01 +00:00
  • 2b80bf4683 Improved documentation Michael 2017-10-13 09:26:07 +00:00
  • 09020192d6 Diaspora: Support account migration Michael 2017-10-13 09:22:05 +00:00
  • bdf0a62fdd regenerated master messages.po file Tobias Diekershoff 2017-10-13 07:28:17 +02:00
  • 6a7b3f19ae Merge pull request #3781 from annando/display-improvements Tobias Diekershoff 2017-10-12 23:44:17 +02:00
  • 5acdd18c00 Improve the data generation for the display page Michael 2017-10-12 19:54:49 +00:00
  • f4859fbd8d Merge pull request #3780 from AlfredSK/patch-1 Michael Vogel 2017-10-12 18:07:25 +02:00
  • 80dde20c64 Update vier with new global support forum S.Krumbholz 2017-10-12 15:59:13 +02:00
  • bc41a2b606 Merge pull request #3778 from annando/initialize-sql Tobias Diekershoff 2017-10-12 07:24:16 +02:00
  • eeec1ea163 We should take the event-id as well Michael 2017-10-11 20:45:03 +00:00
  • 42a76bced9 export event data for display purposes Michael 2017-10-11 19:51:18 +00:00
  • 7b833834f9 Avoid basepath problems Michael 2017-10-11 18:21:10 +00:00
  • 225eea2ca6 Avoid undefined class variables Michael 2017-10-11 14:52:08 +00:00
  • a29b7e7153 "dba" is now a static class Michael 2017-10-11 12:56:36 +00:00
  • 57be4f047e Merge pull request #3776 from annando/initialize-sql Tobias Diekershoff 2017-10-11 07:14:46 +02:00
  • dbcd1d1ae3 Additional check if the database object is initialized Michael 2017-10-10 22:25:38 +00:00
  • 63e02eb57f Checks if the database variable is initialized Michael 2017-10-10 22:18:57 +00:00
  • c2472d9981 Merge pull request #3774 from tobiasd/20171010-lng Michael Vogel 2017-10-10 11:39:56 +02:00
  • 49cc514f29 Merge pull request #3775 from annando/ostatus-nick-change Tobias Diekershoff 2017-10-10 11:23:51 +02:00
  • 763838c78d OStatus: Better handling of changed nicknames Michael 2017-10-10 09:13:37 +00:00
  • 0b66f3ed1e update for ES thx Albert Tobias Diekershoff 2017-10-10 07:13:52 +02:00
  • 61095f7546 update for PT BR thx abinoam Tobias Diekershoff 2017-10-10 07:12:40 +02:00
  • ed13034e23 Merge pull request #3773 from annando/force-republish Tobias Diekershoff 2017-10-09 21:39:24 +02:00
  • c8eefbd091 Force a republish to the directory server Michael 2017-10-09 19:26:45 +00:00
  • 4c75c59039 Merge pull request #3772 from annando/relocate-ignore Tobias Diekershoff 2017-10-09 05:16:32 +00:00
  • 09af73168c Process "relocate" messages even if we are ignoring a contact Michael 2017-10-09 05:02:50 +00:00
  • 62aa839876 Merge pull request #3771 from tobiasd/20171008-doc rabuzarus 2017-10-08 14:00:57 +02:00
  • fd5cf0f147 Merge pull request #3770 from tobiasd/20171008-dotca Michael Vogel 2017-10-08 12:39:03 +02:00
  • 77471bccd3 changed links Tobias Diekershoff 2017-10-08 11:40:06 +02:00
  • 74eb0ae923 move to forum.friendi.ca Tobias Diekershoff 2017-10-08 11:38:26 +02:00
  • 8b9ce4a0ec move to forum.friendi.ca Tobias Diekershoff 2017-10-08 11:25:35 +02:00
  • 495b639e55 .com -> .ca Tobias Diekershoff 2017-10-08 10:22:29 +02:00
  • ab60641e3b Merge pull request #3769 from annando/show-forum-posts Tobias Diekershoff 2017-10-08 05:29:41 +00:00
  • 5d0e7d24ba When showing posts for a contact we have to tread forums in a special way Michael 2017-10-08 05:20:09 +00:00
  • 2ac3db7607 Merge pull request #3768 from annando/avoid-sql-error rabuzarus 2017-10-07 23:58:15 +02:00
  • ecce105ae8 Avoid SQL error when in Forum view Michael 2017-10-07 21:51:03 +00:00
  • 829e8ca946 Merge pull request #3767 from annando/bugfix-search rabuzarus 2017-10-07 22:39:33 +02:00
  • 68c6788762 Bugfix: Wrong function in search Michael 2017-10-07 19:51:49 +00:00
  • 22f4e3973e Merge pull request #3766 from annando/trim-feed rabuzarus 2017-10-07 20:40:33 +02:00
  • 67e57a83df Feeds are now trimmed before importing Michael 2017-10-07 18:35:10 +00:00
  • ef6a9e953a Merge pull request #3765 from annando/resend-frio Tobias Diekershoff 2017-10-07 16:00:21 +00:00
  • df1e96441e Frio: Relocate message wasn't send Michael 2017-10-07 15:45:00 +00:00
  • 0f1b27db1e Merge pull request #3764 from annando/contact-blocked Tobias Diekershoff 2017-10-07 13:10:39 +00:00
  • c6dbbe21b4 Preparation for the possibility to globally block contacts Michael 2017-10-07 09:52:43 +00:00
  • cc9074bed5 Merge pull request #3763 from annando/relocation-addr Tobias Diekershoff 2017-10-07 06:01:16 +00:00
  • ceb0dda486 Fixes the not changed "addr" entry when an account is imported Michael 2017-10-07 05:20:46 +00:00
  • 072bf7d13d Merge pull request #3762 from annando/avoid-sql-error Tobias Diekershoff 2017-10-06 23:30:11 +00:00
  • 1870f942d3 Fix SQL error when changing the SSL paths Michael 2017-10-06 19:25:04 +00:00
  • 10089c6e4e Merge pull request #3760 from friendica/revert-3743-task/update-languagedetect Tobias Diekershoff 2017-10-05 12:59:26 +00:00
  • dd57550fe7 Merge pull request #3759 from tobiasd/20171005-en Michael Vogel 2017-10-05 14:24:37 +02:00
  • 95e8daa4c8 update EN US and GB variations Tobias Diekershoff 2017-10-05 14:09:52 +02:00
  • d38f58fd78 Merge pull request #3758 from tobiasd/20171005-vagrant Michael Vogel 2017-10-05 13:04:34 +02:00
  • 97347692ac give the admin user the admin panel in the Vagrant VM Tobias Diekershoff 2017-10-05 12:58:53 +02:00
  • 071946fa78 Revert "Update languagedetect library" Tobias Diekershoff 2017-10-05 11:58:18 +02:00
  • c22920edba Merge pull request #3743 from MrPetovan/task/update-languagedetect Tobias Diekershoff 2017-10-05 08:49:17 +00:00
  • 54e1585c22 set version to 3.6-dev Tobias Diekershoff 2017-10-05 10:07:21 +02:00
  • 12b37ac596 Friendica Version 3.5.3 Tobias Diekershoff 2017-10-05 10:05:01 +02:00
  • 339f922652 revert unwanted (?) changes Tobias Diekershoff 2017-10-05 10:02:06 +02:00
  • 4bf6ffb749 Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5 Tobias Diekershoff 2017-10-05 08:00:27 +00:00
  • 15216d3c34 release date Tobias Diekershoff 2017-10-05 09:57:32 +02:00
  • 5039d87ba7 work on Vagrant Tobias Diekershoff 2017-10-05 09:57:04 +02:00
  • 2bcd5b3243 Merge pull request #3757 from silke/develop Tobias Diekershoff 2017-10-05 07:55:00 +00:00
  • 56bfb0f45a Updated MySQL and PHP requirements in documentation Silke Meyer 2017-10-04 21:57:49 +02:00
  • ab87f1215a Merge remote-tracking branch 'upstream/develop' into develop Silke Meyer 2017-10-04 21:28:35 +02:00
  • eadeb3ed21 Fixed settings for test mysql database and updated documentation Silke Meyer 2017-10-04 20:25:15 +02:00
  • f04c84ac32 typos Tobias Diekershoff 2017-10-04 08:47:39 +02:00
  • 7d3c51216f issue closed Tobias Diekershoff 2017-10-04 07:56:50 +02:00
  • 098eba9256 Merge pull request #3756 from annando/ostatus-blocked Tobias Diekershoff 2017-10-04 05:00:49 +00:00
  • a8a7f4a76d Better handling of blocked contacts in OStatus Michael 2017-10-03 20:52:24 +00:00
  • ef55b7160e Merge pull request #3754 from tobiasd/20171003-de Michael Vogel 2017-10-03 20:17:59 +02:00
  • 262c4d1836 some translation, release month, recent changes Tobias Diekershoff 2017-10-03 06:42:12 +02:00
  • 6440297895 update ZH-CN translation thx mytbk Tobias Diekershoff 2017-10-03 06:35:45 +02:00
  • 57f65a20a6 update DE translation Tobias Diekershoff 2017-10-03 06:29:15 +02:00
  • 1470e8e747 Merge pull request #3753 from annando/diaspora-reshare Tobias Diekershoff 2017-10-02 21:45:40 +02:00
  • c33aa2ccee Diaspora: Reshares of reshares sometimes had problems Michael 2017-10-02 19:00:33 +00:00
  • a6f359190f Merge pull request #3752 from tobiasd/20171002-zhcn Michael Vogel 2017-10-02 19:19:15 +02:00
  • dcc9e16d50 update ZH-CN translation Tobias Diekershoff 2017-10-02 18:08:21 +02:00
  • cde1d91b2e Merge pull request #3751 from tobiasd/201709´1001-messages Michael Vogel 2017-10-01 09:14:58 +02:00
  • 59b8b7dbee regenerated master messages.po file Tobias Diekershoff 2017-10-01 08:56:06 +02:00
  • 8f02bcbda8 Merge pull request #3750 from annando/mail-guid Tobias Diekershoff 2017-10-01 02:07:18 +02:00
  • fffc360c6a Detect the hostname when the URI is in the format data@host.tld Michael 2017-09-30 21:39:32 +00:00
  • 5a77f7c326 Merge pull request #3749 from annando/poller-db-update Tobias Diekershoff 2017-09-30 19:49:44 +02:00
  • 3354f01ed5 Doxygen and bugfix Michael 2017-09-30 17:42:03 +00:00
  • 2971501f63 The direct structure call is now only executed when called via the poller.php Michael 2017-09-30 17:12:27 +00:00
  • d691c2e621 Database structure call is now executed directly when it cannot be called via proc_run Michael 2017-09-30 16:45:35 +00:00
  • 7d746482b8 Merge pull request #3748 from annando/single-user Tobias Diekershoff 2017-09-30 16:13:51 +02:00
  • 88a70f9e2a Possibly better handling of the single user admin setting Michael 2017-09-30 13:58:07 +00:00
  • 01c2452547 Merge pull request #3747 from annando/additional-checks Tobias Diekershoff 2017-09-30 13:37:32 +02:00
  • bd88179419 Add additional checks for the worker Michael 2017-09-30 11:19:46 +00:00
  • cc7d5602a9 Merge pull request #3746 from annando/snarl Tobias Diekershoff 2017-09-30 10:15:29 +02:00