Commit Graph

10412 Commits

Author SHA1 Message Date
Michael Vogel a663e4693f Further improvement of the contact menu 2015-10-04 23:41:13 +02:00
Michael Vogel 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Tobias Diekershoff 79391bbb62 Merge pull request #1936 from annando/1510-contact-menu
The contact menu is now improved (for example a "Follow" link)
2015-10-04 21:30:35 +02:00
Michael Vogel b037f977fa The contact menu is now improved (for example a "Follow" link) 2015-10-04 21:17:28 +02:00
Tobias Diekershoff e10dc09bbc Merge pull request #1935 from annando/1510-bugfix-repair
Bugfix: Repairing a contact was more like killing the contact ...
2015-10-04 20:10:38 +02:00
Michael Vogel 05ae3d528e A contact that couldn't be resolved is know known as "UNKNOWN" 2015-10-04 19:48:29 +02:00
Michael Vogel 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Tobias Diekershoff 9f68676db6 Merge pull request #1934 from annando/1510-better-notification
Let the notification look more like the follow dialog
2015-10-04 17:49:02 +02:00
Tobias Diekershoff d96a55e803 Merge pull request #1931 from annando/1510-documentation-htconfig
Documentation of .htconfig.php values
2015-10-04 17:46:50 +02:00
Michael Vogel c49a1b1f8d Added explanation how to add a parameter to the .htconfig.pgp 2015-10-04 17:37:08 +02:00
Michael Vogel 8c514307cf For safety reasons include the include 2015-10-04 17:20:47 +02:00
Michael Vogel 4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Tobias Diekershoff e1f3f2bc6c Merge pull request #1933 from annando/1510-follow-more-data
Show more information when following a new contact
2015-10-04 17:02:27 +02:00
Tobias Diekershoff 18e8d0de59 Merge pull request #1932 from annando/1510-vier-2
Small optical changes in "vier"
2015-10-04 17:01:25 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel ba41336099 Preparation for a not found contact. 2015-10-04 14:49:12 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel 1d71dde7ef Beautyfied code. Link to "follow" on community profiles 2015-10-04 14:40:02 +02:00
Michael Vogel 3b18c6cb0c Small optical changes in "vier" 2015-10-04 12:24:00 +02:00
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
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