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

10822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rabuzarus 2aad62190f template rework: use viewcontact_template.tpl also for directory 2015-10-22 22:48:49 +02:00
Tobias Diekershoff 64a5b33e77 Merge pull request #1973 from annando/1510-ejabberd-auth 
Support for additional passwords for ejabberd
 2015-10-20 07:11:47 +02:00
Michael Vogel 891ad5b39d Support for additional passwords for ejabberd 2015-10-19 19:03:11 +02:00
Michael Vogel 59559e7452 Merge pull request #1971 from tobiasd/20151019-docs 
Updates to the documentations
 2015-10-19 10:10:24 +02:00
Tobias Diekershoff c652aec970 Updates to the documentations 2015-10-19 07:58:13 +02:00
rabuzarus f9c0c1d696 template rework: use viewcontact_template.tpl for contact dealing pages 2015-10-18 17:12:48 +02:00
Tobias Diekershoff 5317c0b28f Merge pull request #1968 from annando/1510-directory-configuration 
Set the new configuration for the global directory when updating
 2015-10-18 16:08:48 +02:00
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 e55f9f8f07 Merge dir into template_rework 2015-10-17 22:22:20 +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
Michael Vogel b75a3c8943 Automatically set the new configuration for the global directory when updating. 2015-10-17 15:26:11 +02:00
Tobias Diekershoff ddaacc1e53 Merge pull request #1965 from rabuzarus/event-attendance 
fix translation bug for likers
 2015-10-17 12:51:19 +02:00
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