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 |
|
|
|
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 |
|
|
|
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 |
|
rabuzarus
|
0167a2bd61
|
port of Hubzillas code highlight feature
|
2016-06-16 11:38:12 +02:00 |
|
rabuzarus
|
7b602a20e6
|
frio - bookmarklet - open jot only if it is available
|
2016-06-16 00:27:45 +02:00 |
|
rabuzarus
|
dfce0f5b64
|
frio: open jot modal automatically on bookmarklet page
|
2016-06-16 00:20:00 +02:00 |
|
|
|
5ec7626b12
|
Merge pull request #2610 from rabuzarus/1406-frio-search-fix
frio: fix searchbox - comment tag wasn't closed
|
2016-06-14 13:44:14 +02:00 |
|
rabuzarus
|
7ec13d4534
|
frio: fix searchbox - comment tag wasn't closed
|
2016-06-14 10:41:14 +02:00 |
|
Michael Vogel
|
365101066a
|
Merge pull request #2605 from rabuzarus/1306-aside-group-fix
frio: fix an css issue with sidebar-group checkbox alignment
|
2016-06-13 14:34:08 +02:00 |
|
rabuzarus
|
06792d6b37
|
frio: fix an css issue with sidebar-group checkbox alignment
|
2016-06-13 12:17:33 +02:00 |
|
rabuzarus
|
82b6917c5f
|
frio: settings_display.tpl + rise frio to 0.2 Alpha
|
2016-06-13 10:57:42 +02:00 |
|
rabuzarus
|
5e98f27fcd
|
frio: events - work on event_form.tpl + datetime.php
|
2016-06-13 10:19:38 +02:00 |
|
Michael Vogel
|
9354d86f38
|
Merge pull request #2601 from rabuzarus/1206-short-info-fix
frio: bind short-info scrollspy on class fn (insteadof p-addr)
|
2016-06-12 21:59:46 +02:00 |
|
rabuzarus
|
468f2d001e
|
frio: scrollspy info - forgot to change all classes
|
2016-06-12 20:34:41 +02:00 |
|
rabuzarus
|
605399032d
|
frio: bind short-info scrollspy on class fn (insteadof p-addr)
|
2016-06-12 20:25:30 +02:00 |
|
rabuzarus
|
85efa93898
|
frio: little css fix
|
2016-06-12 20:20:17 +02:00 |
|
rabuzarus
|
9db614de64
|
frio: some template clean up
|
2016-06-12 20:09:02 +02:00 |
|
rabuzarus
|
b19af8f0b7
|
frio: add css for settings templates
|
2016-06-12 19:59:27 +02:00 |
|
rabuzarus
|
0aa15f74ff
|
Merge develop into 1106-frio-settings
|
2016-06-12 19:34:06 +02:00 |
|
rabuzarus
|
0af572ffba
|
frio: first part for event template work
|
2016-06-12 18:23:10 +02:00 |
|
