nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
10512 commits 2 branches 55 tags 148 MiB
Commit graph

3524 commits

Author SHA1 Message Date
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 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
Tobias Diekershoff a961c29d05 Merge pull request #1962 from annando/1510-attend-vier 
Vier: Some small changes in the template for events
 2015-10-14 06:42:50 +02:00
Michael Vogel 66ea33623b Vier: Some small changes in the template for events 2015-10-13 20:15:01 +02:00
Tobias Diekershoff db14dc13c3 DE: update to the strings 2015-10-13 17:35:08 +02:00
Tobias Diekershoff 1df5a7212b DE: translation of the attend strings THX to Abrax 2015-10-13 17:06:35 +02:00
Tobias Diekershoff 154c55b36e Merge pull request #1957 from fabrixxm/duepuntozeroattend 
attend functionality for duepuntozero
 2015-10-12 21:16:40 +02:00
fabrixxm fd8e8d005a attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
fabrixxm 735755aa0e Merge pull request #1956 from tobiasd/20151012-de 
DE Update to the translation, thx Abrax
 2015-10-12 19:04:51 +02:00
Tobias Diekershoff 5839242792 DE Update to the translation, thx Abrax 2015-10-12 18:08:11 +02:00
Tobias Diekershoff da8c81a12e cleanup forgotten lines 2015-10-12 15:58:34 +02:00
Tobias Diekershoff 3debdf0a91 attend functionality for quattro theme (part of #1953) 2015-10-12 15:34:18 +02:00
Tobias Diekershoff ce03ccc95c Merge pull request #1929 from rabuzarus/event-attendance 
port of reds event attendance feature
 2015-10-12 15:10:03 +02:00
Michael Vogel adba75600a Vier: Support for the new IFTTT addon. 2015-10-11 23:36:23 +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
Tobias Diekershoff 26983bafff Merge pull request #1944 from annando/1510-proxy-picture-size 
Picture size and bugfix for contact names with "<" and ">"
 2015-10-08 08:03:42 +02:00
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Tobias Diekershoff b4ec07ab27 IT: update to the strings 2015-10-07 06:20:54 +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
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
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 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
Tobias Diekershoff 01d38a353c DE update to the translation 2015-10-04 09:23:58 +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
Michael Vogel 42ad8c2b25 New template for http status messages 2015-10-03 23:19:09 +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
Tobias Diekershoff d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +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 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