Tobias Diekershoff
75be187216
Merge pull request #2682 from annando/1607-api-generic-xml
...
API: XML is now generated without templates
2016-08-01 07:25:24 +02:00
Tobias Diekershoff
a684a1c519
Merge pull request #2691 from rabuzarus/2607-contact_confirm
...
frio: intro templates + some restructure of core notifications.php
2016-08-01 07:15:24 +02:00
rabuzarus
f7fa5f166b
notifications.php: unify label strings
2016-07-30 11:03:21 +02:00
Michael Vogel
313bc5b0d2
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-30 10:02:39 +02:00
Tobias Diekershoff
3034edca70
Merge pull request #2693 from rabuzarus/2107-contact_edit
...
frio: contact_edit.tpl was missing a bracket
2016-07-28 15:34:34 +02:00
rabuzarus
e74da01276
frio: contac_edit.tpl was missing a bracket
2016-07-28 11:45:41 +02:00
rabuzarus
320751660d
frio: intro notifications + some restructuring in core for notifications
2016-07-27 19:53:22 +02:00
Michael Vogel
287c9cfbdd
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
2016-07-26 22:15:49 +02:00
Tobias Diekershoff
3e8da763ba
IS update to the translations THX Sveinn í Felli
2016-07-26 11:18:38 +02:00
Tobias Diekershoff
18a35e9ceb
Merge pull request #2688 from rabuzarus/2607-drop
...
frio: provide confirm modal
2016-07-26 10:45:52 +02:00
rabuzarus
694637f9c3
frio: provide confirm modal
2016-07-26 10:36:34 +02:00
rabuzarus
768d10536f
frio: templates for contact_edit and crepair
2016-07-26 09:09:40 +02:00
Tobias Diekershoff
0cbc102c93
DE update to the strings
2016-07-21 09:20:21 +02:00
Michael Vogel
0e7ff6b4db
Removed (now) unused templates
2016-07-19 08:46:41 +02:00
Michael Vogel
838f976715
Some more improvements to xml.php, code cleanup
2016-07-17 23:59:35 +02:00
fabrixxm
ce2f765d28
API: rework share as retweet
...
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
2016-07-13 22:29:07 +02:00
fabrixxm
d98ab84d76
API: update template for friendica:owner data
...
api_user_xml.tpl lost his root element.
Includer templates must provide it.
This allow to use same data structure under different root tag.
2016-07-13 20:11:18 +02:00
rabuzarus
15471f3835
add possibility to load custom page templates + none.php pagetemplate is part of core now
2016-07-11 10:33:39 +02:00
rabuzarus
1cf4924e20
frio: fix url variable for textcomplete in contact_template
2016-07-03 09:50:34 +02:00
Michael Vogel
2ef50cb7e6
Site settings: some settings are disabled when the worker is active
2016-07-02 23:08:33 +02:00
rabuzarus
9170955f80
frio: fix textcomplete for jot
2016-07-01 17:03:40 +02:00
rabuzarus
571a4fed99
frio: restructure jot modal and make jot modal work on mobile
2016-06-27 10:33:20 +02:00
rabuzarus
75f838c53b
frio: move some more headings to the navbar
2016-06-26 11:02:12 +02:00
rabuzarus
aec885b963
frio: fix - jot default was not removed in every case while inserting content
2016-06-26 03:49:21 +02:00
Tobias Diekershoff
6c22cb917a
Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs
...
viewcontacts - make the tabbar available even if hide-friends is active
2016-06-25 19:48:35 +02:00
rabuzarus
fd72f36ffe
move html from function micropro() to own templates
2016-06-25 18:46:47 +02:00
rabuzarus
06959d745e
viewcontacts - make the tabbar available even if hide-friends is active
2016-06-25 16:20:44 +02:00
Michael Vogel
9f99f37975
Merge pull request #2637 from rabuzarus/2506_wallmessage_js
...
frio: Wallmessage - distinguish between own and foreign host
2016-06-25 14:09:44 +02:00
rabuzarus
84263ee8de
frio: Wallmessage - distinguish between own and foreign host
2016-06-25 13:02:53 +02:00
rabuzarus
073f520cee
add missing strings for frio
2016-06-25 12:21:13 +02:00
Michael Vogel
49c19a3c00
Merge pull request #2628 from rabuzarus/1906-event-test
...
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Ben Roberts
864cf0f70d
update MF2 and vcard data for issue #2629
2016-06-21 10:23:43 -04:00
rabuzarus
71c9f562ae
move the cal addon (exporting calendars) to core
2016-06-20 23:31:49 +02:00
Michael Vogel
b411380c4c
Merge pull request #2625 from rabuzarus/1906-event-test
...
frio: disable the events module link in the profile tab
2016-06-20 14:26:27 +02:00
rabuzarus
80f5065eb0
frio: disable the events module link in the profile tab
2016-06-20 13:44:11 +02:00
Michael Vogel
9aa5c2f821
Merge pull request #2623 from rabuzarus/1906-event-test
...
implement a public calendar for vistors of someones profile page
2016-06-20 06:23:25 +02:00
Tobias Diekershoff
9ea9494a9e
Merge pull request #2620 from dissolve/2617
...
recreate fix for #2617 on correct branch
2016-06-20 00:06:52 +02:00
rabuzarus
7495a34b32
implement a public calendar for vistors of someones profile page
2016-06-19 22:04:34 +02:00
Michael Vogel
d0033ca5cf
Merge pull request #2621 from rabuzarus/1206-events-template
...
frio - events - fix double click on date
2016-06-18 21:32:07 +02:00
rabuzarus
ee0942b96d
frio - events - fix double click on date
2016-06-18 15:23:35 +02:00
Michael Vogel
bf2e23c205
Merge pull request #2616 from rabuzarus/1206-events-template
...
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
Ben Roberts
22de27327c
recreate fix for #2617 on correct branch
2016-06-18 08:16:09 -04:00
rabuzarus
48a77af49d
frio - events - delete unneeded css
2016-06-17 14:52:42 +02:00
rabuzarus
134d5949d5
frio - events - restore lost css bracket after merging develop branch
2016-06-17 14:39:59 +02:00
rabuzarus
7dc5fc8b9f
Merge develop into 1206-events-template
...
Conflicts:
view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus
4313982e02
frio - event - code clean up + docu
2016-06-17 14:27:33 +02:00
rabuzarus
606f42701c
frio - event - some js and template refactoring + event view css styling
2016-06-17 14:09:18 +02:00
rabuzarus
0148d0e5d2
frio - event - correct some js
2016-06-17 11:18:54 +02:00
rabuzarus
c99da380cf
frio: events - adapt changes to the templates of the other themes
2016-06-17 10:33:12 +02:00
rabuzarus
8b4c416713
frio: events - split event form in different sections
2016-06-16 20:16:16 +02:00
