miklo
/
friendica
sforkowany z mirror/friendica
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
10 508 Commity
3 Gałęzie
56 Tagi
164 MiB
Wykres commitów

10508 Commity (64a5b33e77f8a7db7a6affc7067bf616c67fcfec)

Autor SHA1 Wiadomość Data
Fabrixxm 880dda4257 Merge branch 'master' back into develop 2015-09-29 10:00:13 +02:00
Fabrixxm 4b6afbf681 Merge branch '3.4.2' 2015-09-29 09:58:16 +02:00
Michael Vogel e8517c1e5c Merge pull request #1909 from fabrixxm/changelog-3.4.2 
3.4.2: update changelog and version
 2015-09-29 09:56:59 +02:00
Fabrixxm 2376cf143c Bump Friendica version 2015-09-29 09:25:59 +02:00
Fabrixxm 32ce091fe2 Update CHANGELOG 2015-09-29 09:25:36 +02:00
Michael Vogel c3ee255b0c Reduction of double executions - hopefully 2015-09-29 06:15:26 +02:00
Michael Vogel ed8cdc7d85 Logging message added 2015-09-28 22:32:56 +02:00
Michael Vogel f0cf9ce519 Prevent double execution 2015-09-28 21:58:58 +02:00
Michael Vogel eb75d9532b Magical mathematics to reduce the number of workers 2015-09-28 19:14:07 +02:00
Michael Vogel 9767801be4 Load depending number of worker queues. 2015-09-28 07:54:28 +02:00
Michael Vogel 7f8284eb1b New functionality to import feeds. Now with support of every used feed format (RSS, RDF, Atom) 2015-09-27 14:02:05 +02:00
Michael Vogel c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
Michael Vogel ae21c40f21 Load depending number of workers 2015-09-27 13:56:20 +02:00
fabrixxm fbe44abd5a Merge pull request #1901 from tobiasd/20150924-pl 
PL update to the strings
 2015-09-25 18:25:13 +02:00
fabrixxm af5da5bece Merge pull request #1903 from annando/1509-bbcode-notifications 
The "about" field in the introductions should be send through bbcode
 2015-09-25 18:24:48 +02:00
Michael Vogel c7b80b532a Bugfix: The "about" field in the introductions should be send through bbcode 2015-09-25 17:47:37 +02:00
Michael Vogel 173d1390df Mute warnings in pidfile/Quit poller after an hour. 2015-09-25 17:38:56 +02:00
Tobias Diekershoff 28df4b2cd0 PL update to the strings 2015-09-24 22:09:39 +02:00
fabrixxm eccc06914c Merge pull request #1899 from strk/postopt-lang 
Remove duplicated calls to language detection
 2015-09-23 11:41:15 +02:00
Sandro Santilli e9f001aa5d Use ampersend to separate postopts, and explicit test for empty string 2015-09-23 11:39:36 +02:00
Sandro Santilli 741b82ccab Use x() function to check for array containement (I think) 
this is response to @fabrixxxm comment
 2015-09-23 11:11:12 +02:00
Sandro Santilli 2a2dd6a1b9 Remove duplicated calls to language detection 
Also avoids overriding existing "lang" specification in an item
 2015-09-23 10:47:34 +02:00
Michael Vogel f8e4a71eda Do a load check during execution of the queue. 2015-09-23 08:56:48 +02:00
Tobias Diekershoff 53719d4ecc Merge pull request #1897 from annando/3.4.2 
Bugfix: Following mail accounts is now possible again
 2015-09-23 06:20:49 +02:00
Michael Vogel 7c8c8b821a Bugfix: Following mail accounts is now possible again 2015-09-22 22:31:22 +02:00
Tobias Diekershoff 05d981be14 Merge pull request #1895 from fabrixxm/rino2-mcrypt 
Adds checks for mcrypt module for RINO2
 2015-09-22 13:15:01 +02:00
Fabrixxm 69dd6869f2 update messages.po 2015-09-22 09:59:12 +02:00
Fabrixxm 554948c22a Adds checks for mcrypt module for RINO2 
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
 2015-09-22 09:50:24 +02:00
Tobias Diekershoff 303a59f1d0 Merge pull request #1894 from annando/1509-diaspora-federation 
Some changes to stay compatible to Diaspora
 2015-09-19 15:51:25 +02:00
Michael Vogel 25fc2c9799 Some changes to stay compatible to Diaspora 2015-09-19 14:00:33 +02:00
Tobias Diekershoff 0a41a8127b Merge pull request #1893 from annando/1509-lockpath 
Avoiding errors when checking for the lockpath
 2015-09-19 13:53:13 +02:00
Michael Vogel a9fdba638f Avoiding errors when checking for the lockpath 2015-09-19 11:30:19 +02:00
Tobias Diekershoff 976a2be1f7 Merge pull request #1892 from annando/1509-vier-attachements 
Now attachments of the type "application" are displayed as well.
 2015-09-18 21:11:57 +02:00
Michael Vogel 6be65f4eae Now attachments of the type "application" are displayed as well. 2015-09-18 21:09:31 +02:00
Michael Vogel 2be91d0226 Merge pull request #1888 from fabrixxm/changelog-3.4.2 
Update changelog
 2015-09-17 21:53:23 +02:00
Tobias Diekershoff 26a2d49d98 Merge pull request #1891 from tobiasd/20150917-de 
DE update to the strings
 2015-09-17 14:25:34 +02:00
Tobias Diekershoff dbc9d87156 DE update to the strings 2015-09-17 14:24:07 +02:00
fabrixxm 8086a21b37 Fix CHANGELOG 2015-09-16 16:59:14 +02:00
Tobias Diekershoff bca4d31410 Merge pull request #1890 from annando/1509-directory 
There is now only one central parameter for the global directory.
 2015-09-15 22:48:34 +02:00
Michael Vogel 5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
Tobias Diekershoff 7a432a6739 Merge pull request #1889 from annando/1509-diaspora-images 
Bugfix: Picture import from Diaspora often failed
 2015-09-15 06:21:19 +02:00
Michael Vogel 345b0d81dd Picture import from Diaspora often failed 2015-09-14 23:14:21 +02:00
fabrixxm 7affbba055 Fix CHANGELOG 2015-09-14 17:31:13 +02:00
Fabrixxm a98d10e800 Update CHANGELOG 2015-09-14 15:22:41 +02:00
Michael Vogel 3ace2136f0 Checking includes for valid paths 2015-09-13 18:47:10 +02:00
Michael Vogel 69daaa61ba With the new queue we don't need "delivery_batch_count" anymore 2015-09-13 08:08:13 +02:00
Michael Vogel 12659fc3a1 Let the cronhook be called different from the cron job. 2015-09-12 20:22:58 +02:00
Michael Vogel 7edce8e266 Don't use a delivery interval when using the worker 2015-09-12 18:08:03 +02:00
Michael Vogel 0a2c161230 Fork as many processes as possible from the start on. 2015-09-12 17:51:27 +02:00
Michael Vogel ce9b4e868b Database update for worker 2015-09-11 21:56:37 +02:00