MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
10378 commits 3 branches 0 tags 96 MiB
Commit graph

10378 commits

This branch
This branch
All branches
Author SHA1 Message Date
rabuzarus 0eae67ea48 update attendance state on profile wall 2015-10-09 14:20:01 +02:00
rabuzarus d85d215bb8 attendance update in network stream 2015-10-09 13:46:08 +02:00
rabuzarus ba1207e6e1 translate attendance with localize_item() 2015-10-08 22:23:09 +02:00
rabuzarus 6a9ec14878 small bugfix in like.php 2015-10-08 20:26:11 +02:00
rabuzarus d2d084b814 treat attendance as like activity 2015-10-08 18:35:33 +02:00
rabuzarus f93a2242e0 missed one to delete 2015-10-04 01:00:24 +02:00
rabuzarus 7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus a13280ac4a revert little rebase mistake 2015-09-30 15:30:13 +02:00
rabuzarus 2ff67ef5ed fixes like/dislike for photos 2015-09-30 14:39:00 +02:00
rabuzarus f5c7006f30 rest of the consensus porting work and integration into friendica 
Credits to Mike Macgirvin for the code
 2015-09-30 14:38:13 +02:00
rabuzarus 0077494396 make event confirmation work 2015-09-30 14:35:17 +02:00
rabuzarus 37fccee503 first work for consensus 2015-09-30 14:34:10 +02:00
fabrixxm 2e8caf7f27 Merge pull request #1915 from rabuzarus/hide_profilepics 
don't show profile photos in albums to others than owner or remote
 2015-09-30 08:57:31 +02:00
fabrixxm 67638118e7 Merge pull request #1912 from annando/1509-worker 
New way of background processing
 2015-09-30 08:56:54 +02:00
fabrixxm 2e9e17baad Merge pull request #1911 from annando/1509-i18n-events 
Localisation of the event page
 2015-09-30 08:46:57 +02:00
fabrixxm 2fc9e426a2 Merge pull request #1910 from annando/1509-new-feed-import 
New feed import functionality
 2015-09-30 08:46:08 +02:00
rabuzarus 3d7602a5a3 don't show profile photos in albums to others than the owner or remote user 2015-09-29 19:44:26 +02:00
Michael Vogel 6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Michael Vogel abe31d7e60 Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import 2015-09-29 10:27:04 +02:00
Michael Vogel 5d5d85eb4a Merge remote-tracking branch 'upstream/develop' into 1509-worker 2015-09-29 10:25:59 +02:00
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