friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
15,649 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

15649 Commits

Author SHA1 Message Date
Thomas Willingham 11c5f471af Fix/workaround weird load order issue. 2017-07-08 16:25:13 +01:00
Tobias Diekershoff d88584af69 Merge pull request #3567 from rjm6823/develop 
Contacts page directory link
 2017-07-08 08:36:54 +02:00
Tobias Diekershoff 56a57aaca4 Merge pull request #3564 from annando/1707-expire 
Split expire.php in several processes / small worker changes
 2017-07-07 19:47:22 +02:00
Michael Vogel 512e58a7db Merge pull request #3568 from tobiasd/20170707-esde 
DE and ES translations
 2017-07-07 18:56:26 +02:00
Tobias Diekershoff 1e0f4c2f70 DE and ES translations 2017-07-07 08:43:10 +02:00
RJ Madsen fec2f8fd82 Replacing quotes around new directory link 2017-07-06 17:56:18 -04:00
RJ Madsen d7de2e0750 Fixed minor spaces to tabs conversion 2017-07-06 17:33:30 -04:00
RJ Madsen c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen 7593152bcb re-named variable to match scheme 2017-07-06 16:37:55 -04:00
RJ Madsen b7b8c5477b Converted from space to tab indentation 2017-07-06 15:27:03 -04:00
RJ Madsen 255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Michael 30b0a035f9 Split expire.php in several processes / small worker changes 2017-07-06 05:48:02 +00:00
Tobias Diekershoff fd36e4e8b0 Merge pull request #3559 from annando/some-more-poller 
The endless story "poller" just continues ;-)
 2017-07-04 08:38:38 +02:00
Michael c8b1b51809 Improved logging 2017-07-04 05:31:42 +00:00
Michael 0ab7915810 Only kill the first stale process 2017-07-04 05:01:06 +00:00
rabuzarus 8ed6b037cf Merge pull request #3561 from annando/issue-3560 
Guests should be able to use the search as well
 2017-07-04 01:09:01 +02:00
Michael e26991ba26 Guests should be able to use the search as well 2017-07-03 20:48:44 +00:00
Michael Vogel bd43ee1277 Merge pull request #3556 from tobiasd/20170628-doc 
small additions to the docs
 2017-07-02 21:45:12 +02:00
Michael bae4569a0b Avoid the killing of the wrong process 2017-07-02 19:43:36 +00:00
Tobias Diekershoff 87bcc1db97 Update INSTALL.txt 2017-07-02 21:39:15 +02:00
Michael Vogel 2b161108fe Merge pull request #3439 from tobiasd/20170506-token 
[Needs OpenID testing] Add token to register
 2017-07-02 21:31:53 +02:00
Tobias Diekershoff 29e9705d26 Update Install.md 2017-07-02 07:52:07 +02:00
Tobias Diekershoff 089d58527e Update INSTALL.txt 2017-07-02 07:51:31 +02:00
Michael 0cd9db9cb7 Degrade priority step by step 2017-07-01 18:55:12 +00:00
Michael 7726353601 Prevent soon killings 2017-06-30 23:08:08 +00:00
Tobias Diekershoff 1a7dce6814 Update Install.md 2017-06-30 13:16:29 +02:00
Tobias Diekershoff 4593f43254 Update INSTALL.txt 2017-06-30 13:15:47 +02:00
Michael Vogel ccff6a1cb8 Merge pull request #3557 from tobiasd/20170630-de 
DE translations
 2017-06-30 11:46:58 +02:00
Tobias Diekershoff dd250174b8 Let there be... 2017-06-30 10:38:11 +02:00
Tobias Diekershoff e515c20cbc DE translations 2017-06-30 08:24:45 +02:00
Michael 99b86c9fd9 Just found the handbrake ... 2017-06-29 21:19:31 +00:00
Michael b9bcc921a6 Merge remote-tracking branch 'upstream/develop' into some-more-poller 2017-06-29 05:41:06 +00:00
Michael 18d6eba8d0 Some more performance stuff 2017-06-29 05:40:02 +00:00
Tobias Diekershoff ec29d3f446 Merge pull request #3555 from annando/semaphore-fix 
Hopefully a fix for semaphore warnings and for the missing field
 2017-06-29 06:40:32 +02:00
Michael 526db18f5c Hopefully a fix for semaphore warnings and for the missing field in the workerqueue 2017-06-28 18:31:33 +00:00
Tobias Diekershoff 076cf702b0 Added a short usage example of exportet profile data 2017-06-28 15:11:35 +02:00
Tobias Diekershoff 22a2c3b9bf added a short note about backups to the INSTALL files 2017-06-28 15:10:57 +02:00
Tobias Diekershoff f846233a6b Merge pull request #3551 from annando/semaphore-locking 
Semaphore based locking and hopefully the fix for the workerqueue
 2017-06-28 08:54:07 +02:00
Michael Vogel 578cb0a55c Merge pull request #3539 from AndyHee/20170617-admin_settings 
Corrected names for counting/ listing account-types in admin panel
 2017-06-28 07:24:41 +02:00
Michael 4515c36f69 Semaphore based locking and hopefully the fix for the workerqueue 2017-06-28 04:53:11 +00:00
Tobias Diekershoff 08af48ce97 Merge pull request #3550 from AndyHee/20170626-en_GBUS_translations 
EN-GB and EN-US Translations
 2017-06-26 13:29:50 +02:00
Andy H 0f604538ba EN-GB and EN-US Translations 2017-06-26 18:03:32 +07:00
rabuzarus 652d67d004 Merge pull request #3549 from AndyHee/20170626-DE_translations 
DE Translation
 2017-06-26 12:43:37 +02:00
Andy H afa7421aa2 DE Translation 2017-06-26 17:43:00 +07:00
Andy H bee466532f DE Translation 2017-06-26 17:31:12 +07:00
rabuzarus 4721026a52 Merge pull request #3547 from tobiasd/20170626-Vagrantfile 
Vagrant > 1.5 needs an additional parameter
 2017-06-26 11:45:03 +02:00
rabuzarus 58b4c5e217 Merge pull request #3548 from tobiasd/20170626-de 
DE translations
 2017-06-26 11:44:51 +02:00
Tobias Diekershoff 6672dcc36f DE translations 2017-06-26 11:07:18 +02:00
Tobias Diekershoff d06245262f Vagrant > 1.5 needs an additional parameter 2017-06-26 11:03:28 +02:00
Michael Vogel 771d122594 Merge pull request #3546 from tobiasd/20170624-search 
autofocus for search input field
 2017-06-24 22:46:39 +02:00