Michael Vogel
|
61e3a8ca3a
|
Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
notifications restructure
|
2016-08-08 07:41:48 +02:00 |
rabuzarus
|
a5a28d11fc
|
frio - provide mobile login/register buttons for mobile view
|
2016-08-05 20:17:06 +02:00 |
Michael Vogel
|
6abeff10c0
|
Merge pull request #2711 from rabuzarus/0408-frio-photo-tpl-fix
photos - include paginate into the templates - provide a photo_album.…
|
2016-08-04 23:59:43 +02:00 |
rabuzarus
|
3921113e5c
|
photos - include paginate into the templates - provide a photo_album.tpl for frio
|
2016-08-04 21:53:22 +02:00 |
rabuzarus
|
94d297155c
|
frio:implement comment highlighting with jquery.color
|
2016-08-04 19:59:45 +02:00 |
Tobias Diekershoff
|
3432268e80
|
Merge pull request #2708 from rabuzarus/0407-frio-picture-wall-fix
frio:fix jot - posts with images were not available on wall
|
2016-08-04 14:57:15 +02:00 |
rabuzarus
|
e374ec2bc8
|
frio:fix jot - posts with images were not available on wall
|
2016-08-04 14:33:08 +02:00 |
rabuzarus
|
e34e1f7c2b
|
frio: add intro action buttons for mobile devices
|
2016-08-04 11:36:31 +02:00 |
rabuzarus
|
ae905cbd1b
|
Merge develop into 0308-Notifications-restructure
Conflicts:
mod/notifications.php
|
2016-08-03 12:53:38 +02:00 |
rabuzarus
|
bcee356f66
|
notifications - add docu & pagination
|
2016-08-01 23:04:41 +02:00 |
rabuzarus
|
7a4be1cead
|
notifications.php: move more code to NotificationsManager
|
2016-08-01 18:18:11 +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 |
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 |
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 |
rabuzarus
|
1cf4924e20
|
frio: fix url variable for textcomplete in contact_template
|
2016-07-03 09:50:34 +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
|
aec885b963
|
frio: fix - jot default was not removed in every case while inserting content
|
2016-06-26 03:49:21 +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 |
Ben Roberts
|
864cf0f70d
|
update MF2 and vcard data for issue #2629
|
2016-06-21 10:23:43 -04: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 |
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 |
Tobias Diekershoff
|
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 |
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 |
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 |
Michael Vogel
|
6d50d18242
|
Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
|
2016-06-12 14:20:42 +02:00 |
Michael Vogel
|
0eb69b963e
|
Merge pull request #2587 from rabuzarus/1006-short-info
frio: a short contact informations will be provided at the second nav…
|
2016-06-12 12:12:43 +02:00 |
rabuzarus
|
5fc5ef5461
|
frio: provide login.tpl
|
2016-06-12 11:51:43 +02:00 |
rabuzarus
|
3264efb238
|
Merge pull request #2583 from fabrixxm/frio-login-modal
Frio: login button opens a modal
|
2016-06-12 10:50:56 +02:00 |