Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-15 05:33:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
16535 commits 3 branches 64 tags 246 MiB
Commit graph

16535 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alexandre Alapetite
329ab7d153 More general check for semaphore 2017-06-28 22:38:22 +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
Alexandre Alapetite
4eaa6b94a6 Hide semaphone warning 
https://github.com/friendica/friendica/issues/3553
 2017-06-28 18:38:18 +02: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
AndyHee
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
AndyHee
afa7421aa2 DE Translation 2017-06-26 17:43:00 +07:00
AndyHee
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
Tobias Diekershoff
e0c46678e5 autofocus for search input field 2017-06-24 10:17:16 +02:00
Tobias Diekershoff
4ab736860c Merge pull request #3544 from annando/poller-bugfix-again 
Bugfix: Poller entries had been executed multiple times
 2017-06-21 10:04:13 +02:00
Michael
7097673fa1 Bugfix: Poller entries had been executed multiple times 2017-06-21 03:49:05 +00:00
AndyHee
0a71a55fd0 Regenerated master messages.po file 2017-06-20 13:15:23 +07:00
Tobias Diekershoff
13c8750c27 Merge pull request #3542 from annando/1706-not-done 
Only show the number of workerqueue entries that aren't done
 2017-06-20 07:39:28 +02:00
Michael
be3bfaec80 Only show the number of workerqueue entries that aren't done 2017-06-20 02:05:16 +00:00
Tobias Diekershoff
638e6491cc Merge pull request #3541 from annando/bugfix-poller 
Recurring had been executed only once - and then never again
 2017-06-19 20:35:08 +02:00
Michael
ceaa191d8c Recurring had been executed only once - and then never again 2017-06-19 18:20:19 +00:00
Michael Vogel
31d77f7124 Merge pull request #3540 from tobiasd/20170619-de 
DE translations
 2017-06-19 19:33:37 +02:00
Tobias Diekershoff
45ef0a9ee0 DE translations 2017-06-19 17:03:08 +02:00
Hypolite Petovan
ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2 
Coding convention applied split 2-6-2 (of 2-14-2)
 2017-06-18 18:44:34 -04:00
Roland Häder
29ca5b3021
added missing curly brace ... :-( 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 23:15:50 +02:00
Roland Häder
c0a0748831
converted upper-case to lower-case as they are no constants but keywords 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 23:15:11 +02:00
Roland Häder
dc8f758860
Opps, also this! 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 22:14:31 +02:00
Roland Häder
470556764b
Fixed some stuff as requested by @Hypolite 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-18 22:10:03 +02:00