clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,438 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

10438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 05b2836d66 Merge pull request #1926 from annando/1510-permit-crawler 
New option to permit crawlers
 2015-10-04 08:53:32 +02:00
Tobias Diekershoff a3221945d0 Merge pull request #1923 from annando/1510-feed-remote-self 
Bugfix: Remote self hadn't worked anymore since the new feed import
 2015-10-04 08:51:58 +02:00
Tobias Diekershoff b5dccb0a95 Merge pull request #1922 from annando/1510-vier-right-aside 
"Vier" comes now with the right column from Diabook
 2015-10-04 08:51:36 +02:00
Michael Vogel c0e277cec8 Issue 1913: Report invalid feed 2015-10-04 00:28:15 +02:00
Michael Vogel 4e1bffd0a9 Issue 1914: A feed was falsely detected as OStatus 2015-10-03 23:57:00 +02:00
Michael Vogel 42ad8c2b25 New template for http status messages 2015-10-03 23:19:09 +02:00
Michael Vogel 2840bf2293 New option to permit crawlers 2015-10-03 23:16:40 +02:00
Michael Vogel 525442e4fd Merge pull request #1916 from rabuzarus/geotag 
port of red matrix geotag feature
 2015-10-03 22:06:28 +02:00
rabuzarus 5576c004ad Merge origin/geotag into geotag 2015-10-03 20:41:26 +02:00
rabuzarus c775d6885b port of reds geotag feature 2015-10-03 20:24:35 +02:00
Michael Vogel f92a253946 Bugfix: Remote self worked anymore 2015-10-03 13:58:10 +02:00
Michael Vogel 3ae0deadb6 The right side now contains much stuff from diabook - but completely reworked. 2015-10-03 12:55:55 +02:00
Michael Vogel 47c855388e Vier: Menu at the right side (inspired and copyied from diabook) 2015-10-01 08:19:35 +02:00
Michael Vogel a102fd83e8 Merge pull request #1919 from tobiasd/20151001-calendar 
add a header to seperate the beginning of week settings
 2015-10-01 08:09:28 +02:00
Tobias Diekershoff d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Tobias Diekershoff f8eca3da91 Merge pull request #1918 from annando/1510-events 
Event improvements
 2015-10-01 06:09:37 +02:00
Michael Vogel 5fe357ee75 Rearrange the navigation bar on smaller windows 2015-09-30 21:59:55 +02:00
Michael Vogel 389b7de451 Setting for the first day of the week 2015-09-30 19:18:13 +02:00
Michael Vogel 68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus b6781f5e40 Merge geotag into develop 
Conflicts:
	mod/photos.php
 2015-09-30 12:37:20 +02:00
rabuzarus 8e1564965d port of reds geotag feature 2015-09-30 12:33:57 +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 337aef87ef port of reds geotag feature 2015-09-30 00:19:54 +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