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

10654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff d640128dc9 Merge pull request #1966 from annando/1510-event-guid 
Issue 1561: Deleting events (And some other event stuff)
 2015-10-17 12:51:09 +02:00
Michael Vogel 8a79e1afb3 The datepicker is now localised 2015-10-17 10:48:13 +02:00
Michael Vogel 8395f67351 Events on Diaspora now looking okay. 2015-10-17 09:41:58 +02:00
Michael Vogel 2070c96dd1 Changing the acl does not work when editing posts - so it is disabled for events. 2015-10-17 08:46:45 +02:00
Michael Vogel 2178be9863 Merge branch '1510-event-guid' of github.com:annando/friendica into 1510-event-guid 2015-10-17 08:29:22 +02:00
Michael Vogel 316276cb6d Editing an item with an event is now opeing the event edit form. 2015-10-17 08:27:33 +02:00
Michael Vogel 485e65871e Avoid wrong birthdays 2015-10-17 02:36:16 +02:00
Michael Vogel 7f9711ffe6 Delete event when the item is deleted 2015-10-17 01:25:25 +02:00
Michael Vogel dd46a6ff68 Store the event when a summary or a description is set 2015-10-17 00:58:22 +02:00
rabuzarus 67f699403a match.php: restructure acdording to the change of match.tpl 2015-10-17 00:39:50 +02:00
rabuzarus 20bb16859f dirfind.php: move html to templates 2015-10-17 00:19:01 +02:00
Michael Vogel fcc185a182 Unsure to store the guid with new events 2015-10-16 23:50:34 +02:00
rabuzarus 6ebb21a935 directory.php: move html to templates 2015-10-16 21:44:10 +02:00
rabuzarus 642f3fca1a fix translation bug for likers 2015-10-14 19:48:57 +02:00
Tobias Diekershoff 7ae884f132 Merge pull request #1964 from rebeka-catalina/FAQignoreDescr 
FaQignoreDescr
 2015-10-14 18:11:36 +02:00
rebeka-catalina 9817104ebc Clarified description of ignore 2015-10-14 17:48:26 +02:00
Tobias Diekershoff c855c9ba67 Merge pull request #1963 from annando/1510-feed-warning 
Avoid a warning when a feed contains no items.
 2015-10-14 08:49:02 +02:00
Michael Vogel 65228e37bb Avoid a warning when a feed contains no items. 2015-10-14 08:10:06 +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 f3e1d12643 Merge pull request #1961 from tobiasd/20151013-typo 
typo in markdown syntax
 2015-10-13 21:42:01 +02:00
Michael Vogel 66ea33623b Vier: Some small changes in the template for events 2015-10-13 20:15:01 +02:00
Tobias Diekershoff e47acf83d2 typo in markdown syntax 2015-10-13 18:22:45 +02:00
Tobias Diekershoff 1e0aa4b22e Merge pull request #1960 from tobiasd/20151013-deA 
DE: update to the strings
 2015-10-13 17:37:01 +02:00
Tobias Diekershoff db14dc13c3 DE: update to the strings 2015-10-13 17:35:08 +02:00
Tobias Diekershoff 407560532c Merge pull request #1959 from tobiasd/20151013-de 
DE: translation of the attend strings THX to Abrax
 2015-10-13 17:09:39 +02:00
Tobias Diekershoff 1df5a7212b DE: translation of the attend strings THX to Abrax 2015-10-13 17:06:35 +02:00
Tobias Diekershoff c0d0298b0f Merge pull request #1958 from fabrixxm/event_firstday 
default value for firstDay in events page
 2015-10-12 21:17:03 +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 5299f25920 default value for firstDay in events page 2015-10-12 20:23:09 +02:00
fabrixxm fd8e8d005a attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
fabrixxm 6f2f024b17 Merge pull request #1954 from tobiasd/20151012-messages 
regeneration of the messages.po file for attendance translation
 2015-10-12 19:05:57 +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
fabrixxm 8bf3a36737 Merge pull request #1955 from tobiasd/20151012-quattroattend 
attend functionality for quattro theme (part of #1953)
 2015-10-12 19:03:30 +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 32a21bb02b regeneration of the messages.po file for attendance translation 2015-10-12 15:15:39 +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
Tobias Diekershoff 456e078021 Merge pull request #1952 from annando/1510-ifttt 
Vier: Support for the new IFTTT addon
 2015-10-12 08:18:11 +02:00
Michael Vogel a58be37930 Merge pull request #1943 from tobiasd/20151007-adminname 
personalise emails send from the server
 2015-10-12 07:50:40 +02:00
Michael Vogel adba75600a Vier: Support for the new IFTTT addon. 2015-10-11 23:36:23 +02:00
rabuzarus 5c2923869a this got lost by merge 2015-10-11 20:00:54 +02:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +02:00
rabuzarus db7dca3d5f Merge event-attendance into develop 
Conflicts:
	include/conversation.php
 2015-10-11 19:28:54 +02:00
rabuzarus a539455d81 correct a little mistake (delivery.php was not commited) 2015-10-11 18:20:06 +02:00
rabuzarus 6f04c57ed3 correct a little mistake (ACTIVITY_LIKE is supported) 2015-10-11 15:34:56 +02:00
rabuzarus 0b36b09823 don't send attendance activities to diaspora (unsupported) 2015-10-11 13:07:19 +02:00
Michael Vogel 78b8a081f3 Merge pull request #1951 from tobiasd/20151011-messagespo 
regenerated messages.po file
 2015-10-11 12:01:46 +02:00
Tobias Diekershoff 199bcdb7a0 regenerated messages.po file 2015-10-11 10:38:05 +02:00
Tobias Diekershoff aded5e4127 Merge pull request #1950 from annando/1510-contact-menu 
Some improvements to the contact menus
 2015-10-11 08:53:15 +02:00