1
0
Fork 0
Commit graph

246 commits

Author SHA1 Message Date
rabuzarus
4c1c614fa6 Merge viewcontact into template_rework 2015-10-17 22:28:09 +02:00
rabuzarus
452a3011f7 Merge suggest into template_rework 2015-10-17 22:22:52 +02:00
rabuzarus
dbf1f9efcd Merge dirfind into template_rework 2015-10-17 22:22:35 +02:00
rabuzarus
4b8ca578d1 dirfind: move pagination into template 2015-10-17 22:09:19 +02:00
rabuzarus
b9d9bf8ecd directory: move pagination into template 2015-10-17 21:45:55 +02:00
rabuzarus
6d559bf8a9 viewcontact: use section_title.tpl as headding 2015-10-17 21:40:41 +02:00
rabuzarus
9176e739a4 sugest.php: themeable as whole page 2015-10-17 21:25:21 +02:00
rabuzarus
72896b0f6b unify directory page 2015-10-17 19:45:57 +02:00
rabuzarus
20bb16859f dirfind.php: move html to templates 2015-10-17 00:19:01 +02:00
rabuzarus
6ebb21a935 directory.php: move html to templates 2015-10-16 21:44:10 +02:00
fabrixxm
fd8e8d005a attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
rabuzarus
649578ae33 Merge develop-new into event-attendance-new
Conflicts:
	include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel
efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Michael Vogel
607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. 2015-10-05 17:38:57 +02:00
Michael Vogel
d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +02:00
Michael Vogel
72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Michael Vogel
4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +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
d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel
42ad8c2b25 New template for http status messages 2015-10-03 23:19:09 +02:00
d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Michael Vogel
389b7de451 Setting for the first day of the week 2015-09-30 19:18:13 +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
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
Michael Vogel
6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Michael Vogel
c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
Michael Vogel
25fc2c9799 Some changes to stay compatible to Diaspora 2015-09-19 14:00:33 +02:00
Michael Vogel
5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
Michael Vogel
c6d9b2da23 New setting for requery days 2015-09-05 10:54:39 +02:00
Michael Vogel
56ae056f1d The "manage" option list is now larger. 2015-08-30 22:45:48 +02:00
Michael Vogel
6942b16ef5 See issue 1855. OOhembed is removed. 2015-08-25 19:50:23 +02:00
Michael Vogel
b1dddd2936 Only offer forum search in local mode. 2015-08-25 05:54:50 +02:00
26c5c7991a Merge pull request #1849 from fabrixxm/issue-1841
filebrowser: link image to original picture, show error messages
2015-08-24 14:26:09 +02:00
fabrixxm
cbabac298d filebrowser: link image to original picture, show error messages 2015-08-24 13:54:41 +02:00
Michael Vogel
3bca2db11b Don't show search options in side bar. 2015-08-24 12:12:14 +02:00
Michael Vogel
3ff196f00d Now you can set search options so that searching for contacts or forums isn't occult science anymore. 2015-08-24 11:55:29 +02:00
fabrixxm
81d1dfc006 add 'reload active plugins' button in admin/plugins 2015-08-20 15:01:15 +02:00
621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
eea258f74c add the profile url to the settings pages as alternative to the webfinger. See issue 1621 2015-08-16 22:39:08 +02:00
Michael Vogel
c2a1cf958d The addon "statistics_json" becomes the system setting "nodeinfo" 2015-08-16 21:45:51 +02:00
Michael Vogel
887372a0d7 Bugfix: Conversations with Diaspora now work reliable 2015-08-13 22:49:57 +02:00
5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
6b93325f70 make Inspect Queue link visible in admin adide menu 2015-08-12 15:44:03 +02:00
Michael Vogel
a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Michael Vogel
811e4b6ba1 Documentation for accesskeys added 2015-08-09 09:16:45 +02:00
Michael Vogel
ccaeb00973 Better link descriptions. 2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Michael Vogel
a8a21da6f5 Some steps for a better screen reader compatibility 2015-08-06 08:13:15 +02:00
cd8be48ca7 Merge pull request #1791 from annando/1507-new-poco
Improved Local Directory
2015-08-02 10:31:34 +02:00