Commit graph

4290 commits

Author SHA1 Message Date
e375517a31 DE translation of the core THX Andreas 2016-11-21 11:45:19 +01:00
Michael Vogel
b33e817586 Merge pull request #2951 from tobiasd/20161120-mysql
add MySQL warning in admin panel
2016-11-20 17:09:49 +01:00
b03009d962 use an array for warnings in admin panel 2016-11-20 16:14:09 +01:00
7ad4a8ca93 The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
Michael Vogel
7ca4648ffd Merge pull request #2945 from tobiasd/20161119-admindbwarn
Show a warning message in the admin panel when MyISAM is still in use
2016-11-20 12:38:52 +01:00
7aaaa0a3c7 Show a warning message in the admin panel when MyISAM is still in use 2016-11-20 09:50:14 +01:00
rabuzarus
72953cd1e1 fix indent 2016-11-20 02:07:58 +01:00
rabuzarus
cf07a4413c Bugfix: frio - use white-space: pre-wrap for code elements 2016-11-20 01:51:32 +01:00
Michael Vogel
8a62470599 Merge pull request #2939 from rabuzarus/berlin_frio_fix_match_wrapper_floating
Bugfix: float for remote-friends-in-common wrapper
2016-11-19 21:55:40 +01:00
Michael Vogel
a7a6a1a378 Merge pull request #2936 from tobiasd/20161119-issue844
Additional info in registration request
2016-11-19 21:40:02 +01:00
rabuzarus
1d8f18ff86 Bugfix: float for remote-friends-in-common wrapper 2016-11-19 21:14:28 +01:00
ba24b1b651 Merge pull request #2937 from rabuzarus/1811_jot_charackter_counter
frio: add a very simple character counter to the jot
2016-11-19 19:37:41 +01:00
b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
Silke Meyer
d22807e613 Removes a number of deprecated themes 2016-11-19 18:19:15 +01:00
Silke Meyer
e32a39d129 Marked themes frost and frost-mobile as unsupported 2016-11-19 18:17:21 +01:00
rabuzarus
a8d1a3f997 frio: add a very simple character counter to the jot 2016-11-18 23:48:31 +01:00
7aef99a4f0 ES translation of the core THX Albert 2016-11-17 07:42:41 +01:00
rabuzarus
02a0269a67 Frio Bugfix: clear float at the end of comment-edit 2016-11-16 14:19:09 +01:00
deaf82cfd0 DE translation of the core THX Andreas 2016-11-13 11:23:19 +01:00
6657302602 DE translation of the core 2016-11-10 10:28:20 +01:00
af214e317d ES translation of the core THX Alberto Díaz Tormo! 2016-11-10 10:27:58 +01:00
Hypolite Petovan
98d52bc568 [frio] fix wall_thread.tpl error with unstareable items 2016-11-04 21:19:07 -04:00
Hypolite Petovan
3579a14945 bbcode documentation: minor formatting changes 2016-11-03 21:01:09 -04:00
Hypolite Petovan
68bf1aa4cd bbcode documentation: fix anchors on frio 2016-11-02 22:41:07 -04:00
Hypolite Petovan
6626ef64a9 bbcode documentation: enable overline 2016-11-01 23:07:37 -04:00
Michael Vogel
75a996c4e4 Merge pull request #2839 from Hypolite/Issue-#2822
Issue #2822 - Fix [Embedded content - reload the page to view]
2016-10-25 07:31:20 +02:00
rabuzarus
3a7062af43 frio: line-break for event-owner names in event modals 2016-10-22 15:44:06 +02:00
Hypolite Petovan
71e93d9eb9 Remove debug and extra new lines 2016-10-21 14:24:43 -04:00
Hypolite Petovan
c340d590f7 Fix calendar strings escape
- Fix base event_head.tpl file
- Fix the rest of frio strings
2016-10-21 14:14:20 -04:00
Hypolite Petovan
3358b55433 [frio] Fix unescaped calendar Javascript strings
In French, “today” is “aujourd’hui”, which breaks the current calendar
Javascript strings quoted declaration.

This PR adds quote escaping to the i18n strings.
2016-10-21 11:29:23 -04:00
Hypolite Petovan
b0a0cf94e4 Fix Issue #2865 - reshared posts and additional text
😉
2016-10-20 21:41:17 -04:00
Michael Vogel
1218e2f885 Merge pull request #2863 from rabuzarus/0510-update_fullcalendar
frio: some improvements for displaying events
2016-10-18 00:37:45 +02:00
rabuzarus
b317f811e7 frio: better handling of event location in event hover cards 2016-10-17 22:58:30 +02:00
rabuzarus
967c3b3deb frio: events - don't show author name if there is no author name 2016-10-17 22:51:51 +02:00
rabuzarus
430ffb792e frio: stop the custom cal rendering (if no author-name exist) only for the modes agendaWeek and agendaDay 2016-10-17 22:14:12 +02:00
fabrixxm
b50769b6d0 Merge pull request #2859 from rabuzarus/0510-update_fullcalendar
quattro: fix events_reminder
2016-10-17 20:14:01 +02:00
rabuzarus
88f1affb2f quattro: fix events_reminder 2016-10-17 18:57:21 +02:00
Hypolite Petovan
5efab810f5 [frio] Fix code block display 2016-10-16 23:57:34 -04:00
rabuzarus
8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
Hypolite Petovan
a843858654 Merge from develop 2016-10-08 13:45:14 -04:00
rabuzarus
88cef50aa2 frio: provide a edit profile button for the advanced profile page 2016-10-05 18:07:58 +02:00
rabuzarus
2a3e235f9a show/hide page-flags according to the account-type 2016-10-05 14:45:19 +02:00
aab6ec0ede DE update to the translation 2016-10-04 07:59:35 +02:00
Hypolite Petovan
d9a5554543 Fix Issue #2822 - Add new setting to user settings page
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
2016-10-02 15:25:10 -04:00
Hypolite Petovan
4021109696 Improve field_checkbox.tpl
- Adds a hidden field to ensure the checkbox item will have a value
during save.
- Fix quotes for HTML attribute values
2016-10-02 15:21:20 -04:00
rabuzarus
b59f8fe9e0 Merge pull request #2834 from Hypolite/Issue-#2800
Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
2016-10-02 05:50:10 +02:00
Hypolite Petovan
0094dd8240 Remove repeated comment in frio notification template 2016-10-01 19:03:32 -04:00
Hypolite Petovan
4242c3f749 Fix Issue #2800 - Prevent internal link from switching to Safari in standalone mode
- Add link switch prevention to frio theme
- Add reference to the script page
2016-10-01 18:53:25 -04:00
Hypolite Petovan
f302f66dcd Fix Issue #2800 - Prevent internal links to switch to Safari in standalone mode
Add a event delegation to keep internal links inside the standalone
window.

Fixes 1. of #2800
2016-10-01 18:19:43 -04:00
rabuzarus
21b3037342 frio: improve readabillity for code blocks 2016-10-01 21:16:23 +02:00
82dcc3fe79 Merge pull request #2821 from Hypolite/Issue-#2817
Fix #2817 - Move translation language folder in a subfolder of view
2016-10-01 10:58:32 +02:00
Hypolite Petovan
76b1b109e5 Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing
2016-09-30 23:26:22 -04:00
Hypolite Petovan
5a5284b94e Fix #2817
- Move translation folders under `view/lang`
2016-09-30 10:45:47 -04:00
Hypolite Petovan
f4c2e2244d Fix #2814
- [frio] Add a wrapping `a` tag around the notification text
- Add an event listener preventing popup menus to close when they are
themselves clicked
2016-09-29 23:46:43 -04:00
Hypolite Petovan
a05a425448 [frio] Capitalize Jot tabs title
- Revert translation term change for "permissions"
2016-09-28 21:09:03 -04:00
Hypolite Petovan
24969d79d8 [frio] Capitalize dropdown menu links 2016-09-28 20:59:54 -04:00
Hypolite Petovan
b99b0ad931 [frio] Capitalize a few terms for consistency
- Changed the translation term "permissions" because only frio is using
it
- Changed the vote links style because it is shared with other themes
2016-09-28 20:53:25 -04:00
Hypolite Petovan
34acfa1706 [frio] Fix whitespace style.css 2016-09-28 20:51:56 -04:00
rabuzarus
af3a672570 Merge pull request #2807 from Hypolite/frio-larger-view-develop
[frio] Changes to shared post display (width, base font size)
2016-09-28 20:32:11 +02:00
Hypolite Petovan
ed5e46892d Set block quote size to current text-size 2016-09-28 14:25:41 -04:00
Hypolite Petovan
7de64afc45 Fix abnormal font size for shared posts
- Use normal font size for shared content
2016-09-28 14:01:12 -04:00
Hypolite Petovan
f64bd451ca [frio] Increase available width for shared content
- Added a bottom margin to the shared header
- Removed padding and horizontal margins for the shared content
2016-09-28 13:08:58 -04:00
Hypolite Petovan
01a8671b66 Revert "[frio] Increase center column width"
This reverts commit 0c383ad9ff.
2016-09-28 12:58:44 -04:00
Hypolite Petovan
37b4b0205d [frio] Remove shared content horizontal margins 2016-09-28 11:59:54 -04:00
Hypolite Petovan
0c383ad9ff [frio] Increase center column width
- Added two Bootstrap divisions to the center column
2016-09-28 11:59:05 -04:00
4aa834564a Merge pull request #2802 from annando/xmpp-profile
New fields for the DFRN protocol (XMPP and Account Type)
2016-09-27 20:57:56 +02:00
Michael Vogel
2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel
d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
Michael Vogel
196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
89b5c9276b DE update to the translation 2016-09-24 14:16:58 +02:00
076475383b FR update to the strings, THX Hypolite Petovan 2016-09-24 09:35:23 +02:00
Michael Vogel
3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
529d2fc74b DE update to the translation 2016-09-22 12:37:39 +02:00
754dc02753 PT BR update to the strings 2016-09-21 11:44:01 +02:00
e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
88285b4cbf The info is not that important 2016-09-14 06:45:05 +02:00
f85821839b display current state of PHP logging in admin panel logging informations 2016-09-13 22:52:21 +02:00
fabrixxm
3d6e3cbb78 Merge branch 'master' into develop 2016-09-13 17:19:57 +02:00
4eec289522 FR update to the strings, THX Damien Goutte-Gattat 2016-09-13 15:41:38 +02:00
Michael Vogel
4d959f2f9d Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix
frio: fix dropItem() didn't work for hubzila posts
2016-09-07 06:53:53 +02:00
rabuzarus
d506b0906c frio: fix dropItem() didn't work for hubzila posts 2016-09-07 03:22:02 +02:00
rabuzarus
ced8923323 frio: show attachment icons in posts 2016-09-06 16:21:14 +02:00
Michael Vogel
9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
rabuzarus
9653ae98ae frio: resize textareas on typing. 2016-08-23 16:48:13 +02:00
rabuzarus
37ae63e120 fix contact dropping on contact edit page also for other themes 2016-08-17 16:51:04 +02:00
rabuzarus
212aa99f28 frio: fix contact dropping on contact edit page 2016-08-17 14:32:43 +02:00
rabuzarus
efdb98de6d frio: fix - add string to template 2016-08-13 18:59:59 +02:00
dbab4db754 Merge pull request #2727 from rabuzarus/1008-item-highlight
frio: highlight - test if the item is available in the dom
2016-08-10 14:49:27 +02:00
rabuzarus
83e95a5841 frio: highlight - test if the item is available in the dom 2016-08-10 14:42:57 +02:00
2a79b8c235 Merge pull request #2726 from rabuzarus/1008-item-highlight
Frio: fix auto jump to the item position in /display
2016-08-10 14:42:11 +02:00
rabuzarus
5e440e5359 frio: highlight - wait until the whole page is loaded 2016-08-10 14:26:16 +02:00
rabuzarus
cf23a81c33 frio: highlight - use offset() instead of postion() 2016-08-10 14:14:58 +02:00
rabuzarus
531cba5ce5 frio: fix - I used the wrong variable 2016-08-10 13:33:49 +02:00
rabuzarus
7e65d84577 frio: fix for display auto position scroll + some cleanup 2016-08-10 13:07:13 +02:00
42b7c9cd74 DE translation 2016-08-10 12:31:54 +02:00
rabuzarus
40b0a8e30c frio: Remote is now called Guest 2016-08-09 14:39:18 +02:00
rabuzarus
f52a06d013 frio: correct spelling 2016-08-08 22:25:54 +02:00
rabuzarus
4adc758adb frio: add some missing page background 2016-08-08 22:16:32 +02:00
rabuzarus
62b23b0631 frio: background for people search 2016-08-08 21:54:34 +02:00
Michael Vogel
fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css
frio: unify size of notif-images + background color for unseen notifs
2016-08-08 21:31:00 +02:00
rabuzarus
6b979e5ad8 frio: fix duplicated ID's in aside section 2016-08-08 17:15:35 +02:00
rabuzarus
27f04100c8 frio: unify size of notif-images + background color for unseen notifs 2016-08-08 14:05:33 +02:00
Michael Vogel
61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
notifications restructure
2016-08-08 07:41:48 +02:00
991914d563 vier 2016-08-06 10:54:54 +02:00
a9196dc0f8 Merge pull request #2712 from rabuzarus/0508-frio_mobile_login
frio - provide mobile login/register buttons for mobile view
2016-08-06 06:52:42 +02:00
rabuzarus
f9ccdce4d4 Raise frio version number to 0.7
Since I never raised the version number since starting this theme I raise the version of frio to 0.7 and removed the alpha. It is still much stuff to do for a 1.0 version but frio has done the last half year big steps forward.
2016-08-05 20:37:51 +02:00
rabuzarus
8cc4d7a128 Update README.md 2016-08-05 20:31:14 +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
Michael Vogel
d698534027 Merge pull request #2707 from tobiasd/20160804-de
DE translations THX Andreas
2016-08-04 14:58:24 +02:00
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
c46a7ddd4a DE translations THX Andreas 2016-08-04 12:12:52 +02:00
30b93b74db Merge pull request #2706 from rabuzarus/0308-frio_accept_requests_mobile
frio: add intro action buttons for mobile devices
2016-08-04 12:08:40 +02:00
rabuzarus
e34e1f7c2b frio: add intro action buttons for mobile devices 2016-08-04 11:36:31 +02:00
Michael Vogel
2d63f9deb6 Worker fastlane can now be activated from the admin interface 2016-08-04 08:51:34 +02:00
rabuzarus
ae905cbd1b Merge develop into 0308-Notifications-restructure
Conflicts:
	mod/notifications.php
2016-08-03 12:53:38 +02:00
35bbc3948f DE update to the strings 2016-08-02 12:30:04 +02:00
rabuzarus
6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +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
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
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
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
3e8da763ba IS update to the translations THX Sveinn í Felli 2016-07-26 11:18:38 +02:00
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
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
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
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
rabuzarus
56b600381e frio: add some more settings templates 2016-06-12 00:15:48 +02:00
rabuzarus
f2ad8dd1d4 frio: add settings.tpl 2016-06-11 22:35:08 +02:00
rabuzarus
8ac7575d5b frio: closed profile setting sections on page load 2016-06-11 18:51:20 +02:00
rabuzarus
c2f116f8fd frio short contact informations - some optical polishing 2016-06-11 17:43:02 +02:00
rabuzarus
d39f679230 Merge develop into 1006-short-info
Conflicts:
	view/theme/frio/js/theme.js
2016-06-11 10:52:26 +02:00