Michael Vogel
|
fd80e75693
|
Documentation of .htconfig.php values
|
2015-10-04 12:02:44 +02:00 |
|
|
Michael Vogel
|
c14309094e
|
Merge pull request #1930 from tobiasd/20151004-de
DE update to the translation
|
2015-10-04 10:25:40 +02:00 |
|
Tobias Diekershoff
|
01d38a353c
|
DE update to the translation
|
2015-10-04 09:23:58 +02:00 |
|
|
Tobias Diekershoff
|
be70dde61f
|
Merge pull request #1928 from annando/issue-1913
Issue 1913: Report invalid feed
|
2015-10-04 08:54:59 +02:00 |
|
|
Tobias Diekershoff
|
5d6f02da41
|
Merge pull request #1927 from annando/issue-1914
Issue 1914: A feed was falsely detected as OStatus
|
2015-10-04 08:54:01 +02:00 |
|
|
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 |
|
rabuzarus
|
f93a2242e0
|
missed one to delete
|
2015-10-04 01:00:24 +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
|
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 |
|
|
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 |
|