Hypolite Petovan
7cb44ae25a
Turn all the action <a> tags into buttons
...
- Add CSS changes to support both <a> and <button class="btn btn-link">
- Removed unnecessary "return false" in onclick attributes
- Simplified tabs in profile page to native Bootstrap behavior
2017-03-14 23:47:02 -04:00
Hypolite Petovan
fcea2e8504
Merge branch 'develop' into improvement/frio-action-links-to-buttons
2017-03-14 23:12:21 -04:00
rabuzarus
0143369e54
limit pagination page buttons to max 10
2017-03-14 18:31:03 +01:00
Hypolite Petovan
79f14749df
Merge branch 'develop' into improvement/frio-action-links-to-buttons
...
# Conflicts:
# view/theme/frio/templates/search_item.tpl
# view/theme/frio/templates/wall_thread.tpl
2017-03-14 10:45:17 -04:00
rabuzarus
3061a37b4f
Merge pull request #3232 from Hypolite/issue/#3194-2
...
frio: Revert guid truncation for scrollToItem() and improve dropItem()
2017-03-14 13:04:47 +01:00
Michael Vogel
199bba20d9
Merge pull request #3200 from Hypolite/issue/#3195
...
Improve pagination on frio
2017-03-14 06:05:42 +01:00
Hypolite Petovan
327b00117d
Improve dropItem() functionality
...
- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc
2017-03-13 12:12:13 -04:00
Hypolite Petovan
f2a0c9fad1
Fix scrollToItem breaking dropItem functionality
...
- Add doc
- Refactor function by removing double jQuery wrapping
2017-03-13 12:10:03 -04:00
rabuzarus
e1eb9231f4
Merge pull request #3202 from Hypolite/issue/#3107
...
Delete frio obsolete Colors.php library
2017-03-13 14:17:37 +01:00
Hypolite Petovan
3ea830e221
Strip @hubzilla.server part from guid for autoscrolling purpuses
2017-03-03 21:45:36 -05:00
Hypolite Petovan
cb49bcdb04
Turn actions links into buttons (nav, search)
...
- Mirrored the changes from wall_thread to search_item
- Replaced a navbar link with a button with according CSS
2017-03-03 01:19:49 -05:00
Hypolite Petovan
71f00eaf5f
Turn action links into buttons
...
- Turns <a role="button"> into <button type="button"> for responses and
dropdown menu in wall_thread.tpl
- Removes extraneous decorations
- Updates dropdown style to prevent hover shenanigans
- Add theme color to active "btn-default" buttons
- Add margin top to comment box that was stuck to the action buttons
2017-03-03 01:00:52 -05:00
Hypolite Petovan
024908a3ec
Delete frio obsolete Colors.php library
2017-03-02 19:00:22 -05:00
Hypolite Petovan
ebdc9667f7
Improve readability
...
- Move CSS block above the temporary block
- Add template description
2017-03-02 11:30:41 -05:00
Hypolite Petovan
57ce6cf5da
Improve pagination on frio theme
...
- Add pager class discrimination
- Change links order to first / prev / 1 / ... / 10 / next / last
- Enable dynamic pagination coloring
- Prevent click on disabled links
2017-03-01 23:41:54 -05:00
Hypolite Petovan
21cad46d19
Backward compatibility for theme other than frio
...
- Add .pager .disabled CSS rule
2017-03-01 23:40:34 -05:00
rabuzarus
d27b342f7d
Merge pull request #3167 from Hypolite/bug/comment-box-undefined
...
Bug comment box undefined
2017-02-18 13:29:39 +01:00
Hypolite Petovan
3cdfaa4fad
[frio] Fix comment box not opening on focus, undefined on blur
...
- Remove the callback system for commentOpenUI
- Remove comments
Fixes #3062
2017-02-16 07:06:11 -05:00
Tobias Diekershoff
51a6903b4c
fix for less file of quattro, regen CSS
2017-02-15 07:55:30 +01:00
Tobias Diekershoff
8d2c74eb3c
Merge pull request #3154 from rabuzarus/20170208_-_frio_fix_form_group_search_buttons
...
Bugfix: frio - fix text of input elements disappears behind the button
2017-02-09 10:20:52 +01:00
rabuzarus
ad6ba9203e
fix typo
2017-02-08 18:05:23 +01:00
rabuzarus
dd752189f1
frio - fix text of input elements disappears behind the button
2017-02-08 17:50:59 +01:00
Tobias Diekershoff
e223fee40d
remove float left to fix issue 2987 in quattro theme
2017-02-08 07:21:19 +01:00
Tobias Diekershoff
c574bc5538
Merge pull request #3151 from rabuzarus/20170203_-_frio_fix_tabbar_glitch
...
Bugfix: frio - fix tabbar on mobile view
2017-02-08 06:35:15 +01:00
rabuzarus
60ef105a14
frio - fix tabbar on mobile view
2017-02-08 01:34:36 +01:00
Tobias Diekershoff
2092fa03b2
Merge pull request #3147 from rebeka-catalina/vier_dark_item_links
...
Vier dark item links
2017-02-03 20:28:39 +01:00
rabuzarus
7f1acdb8e9
frio - append tabbar to nav only if it's a direct child of section
2017-02-03 19:37:47 +01:00
rabuzarus
c12850250d
Bugfix: frio - move tabs to the top of the contacts-template
2017-02-03 19:18:10 +01:00
rebeka-catalina
39da1f1d03
Update dark.css
2017-02-03 19:07:39 +01:00
rabuzarus
a71f7aefbb
Bugfix: frio - the tabbar should be hidden if it is in the section element
2017-02-03 19:00:55 +01:00
rebeka-catalina
2483e7cda7
Make links visually different from normal text
2017-02-03 19:00:04 +01:00
rabuzarus
ec4e60ce3a
style the photo album page of the vier theme
2017-01-30 15:00:26 +01:00
Hypolite Petovan
c38a5e443d
Merge branch 'develop' into issue/#3062
...
* develop: (68 commits)
Added documentation
update to the translation
update to the translations
translation docs now contain basic usage of the Transifex client
- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
- Remove misc TinyMCE mentions in docs and minifyjs
- Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
- Remove TinyMCE mentions in themes
- Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
Remove tinyMCE libraries
limit the description of the meta tag to 160 characters in /mod/display
Improved handling of non string values in the config
Bugfix: Caching of non string cache values now works.
Reformatted stuff, improved query
Auto-focus first input field of modal when shown
Use cache instead of config for storing last proc_run time
Some added logging
Bugfix for masses of php warnings
Rearranged the logging
Some changed logging
...
# Conflicts:
# view/theme/frost-mobile/js/theme.js
# view/theme/frost/js/theme.js
2017-01-27 15:30:21 -05:00
Hypolite Petovan
bf6d235b26
- Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
2017-01-26 23:04:38 -05:00
Hypolite Petovan
66482c1d9c
- Remove $theme_richtext_editor boot var
...
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
2017-01-26 22:57:53 -05:00
Hypolite Petovan
4ad6a7f073
- Remove TinyMCE mentions in themes
2017-01-26 22:54:32 -05:00
Hypolite Petovan
9d5384f107
- Remove tinyMCE mentions or convert to addeditortext()
...
- Remove $editselect template value
2017-01-26 22:50:27 -05:00
Hypolite Petovan
73f182069e
Auto-focus first input field of modal when shown
...
Fixes #3101
2017-01-22 11:01:10 -05:00
rabuzarus
5ab6843f38
Bugfix: fix typo in event variable
2017-01-20 13:24:53 +01:00
Hypolite Petovan
b61479ba6e
Merge remote-tracking branch 'friendica/develop' into issue/#3062
...
# Conflicts:
# view/theme/duepuntozero/theme.php
# view/theme/smoothly/theme.php
2017-01-12 09:19:59 +11:00
Hypolite Petovan
30a77cc10a
Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme
...
# Conflicts:
# view/theme/frio/theme.php
2017-01-11 09:39:38 +11:00
Hypolite Petovan
623479a346
Normalize App parameter declaration (view folder)
2017-01-09 23:06:08 +11:00
Michael
16f0221e4c
DBClean now has a smaller limit/Query improvements
2017-01-09 09:37:37 +00:00
Hypolite Petovan
ecd86ec296
Check for existing element in openMenu()
...
- Removed useless val() call in the various insertFormatting()
declarations
2017-01-09 11:34:41 +11:00
Hypolite Petovan
479180ca8e
Merge branch 'develop' into issue/#3062
2017-01-08 11:44:45 +11:00
Hypolite Petovan
05e68de695
Removing extraneous line feeds in conditions
2017-01-08 11:02:30 +11:00
Hypolite Petovan
d7c9b293d3
Update insertFormatting() definition
...
- Remove now useless comment parameter
- Formatting all around
- Update data-role=“insert-formatting” links
- Update onclick=“insertFormatting()” links
2017-01-08 02:16:03 +11:00
Hypolite Petovan
b50f1f970f
Use placeholder attribute for Comment message
...
- Remove global aStr.comment
- Remove global window.commentEmptyText
- Remove head.tpl $comment parameter
2017-01-08 02:13:55 +11:00
Hypolite Petovan
b6ce646d71
Use placeholder attribute for Share message
2017-01-08 02:06:03 +11:00
Hypolite Petovan
daa8e4f901
Cleaning up, actual changes are in the next commits
...
- Formatting
- Trailing spaces
- Extraneous blank lines
- Large comments
2017-01-08 02:03:11 +11:00
Roland Häder
4f25396fae
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-07 09:23:58 +01:00
Roland Häder
cbc32143d7
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-05 08:56:05 +01:00
rabuzarus
0994a0ced5
Frio: Show mobile theme selection only if mobile themes are available
2017-01-05 02:52:39 +01:00
Tobias Diekershoff
0c65dbb8db
Merge pull request #3064 from rabuzarus/20170102_-_add_switch_element_to_frio
...
Frio: implement On/Off switcher element
2017-01-04 13:54:48 +01:00
Roland Häder
42c2e09382
Merge remote-tracking branch 'upstream/develop' into develop
2017-01-04 09:03:00 +01:00
rabuzarus
995e1fe690
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
2017-01-03 17:49:40 +01:00
rabuzarus
860d6d51b9
Frio: add "aria-describedby" to the field templates
2017-01-03 17:38:08 +01:00
rabuzarus
96dfd22d9d
Frio: implent switcher element
2017-01-03 17:33:01 +01:00
rabuzarus
5bef39189b
Bugfix: Frio css - add z-index to badges
2017-01-02 13:38:10 +01:00
rabuzarus
885bd09598
Bugfix: fix the frio poke template
2017-01-01 22:05:24 +01:00
Roland Haeder
d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:49:08 +01:00
Roland Haeder
d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
...
dbm::is_result() calls needed merge
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
rabuzarus
3677467cef
update perfect-scrollbar to version 0.6.15
2016-12-24 02:27:17 +01:00
Roland Häder
820ef8e4c7
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:50:51 +01:00
Roland Häder
f8a213e23b
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:36 +01:00
Roland Häder
20e71d21a6
Merge branch 'rewrites/app_get_baseurl_static' into develop
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/admin.php
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/editpost.php
mod/events.php
mod/install.php
mod/lostpass.php
mod/network.php
mod/notify.php
mod/suggest.php
mod/uexport.php
mod/videos.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
Roland Häder
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
2016-12-22 09:06:00 +01:00
Roland Häder
4c04a78d1b
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-22 09:03:44 +01:00
Michael Vogel
584cf75af3
Merge pull request #3041 from rabuzarus/20161221_-_frio_notifications
...
frio notifications templates + local date & profile link for the notifications page
2016-12-22 07:31:07 +01:00
rabuzarus
747e97a7b2
frio: revert img.intro-photo to 80pxx80px
2016-12-22 01:54:41 +01:00
rabuzarus
2fcbba9410
provide local time for notifications
2016-12-22 00:28:52 +01:00
rabuzarus
125d2f24dd
frio: add profile link to the notifications url
2016-12-21 23:17:55 +01:00
rabuzarus
51c9a66fc3
frio: add notifications templates to frio
2016-12-21 20:39:07 +01:00
Roland Haeder
0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 20:01:51 +01:00
Roland Haeder
2178feab30
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-21 19:59:38 +01:00
rabuzarus
8a9143023d
frio: append hovercard to body element
2016-12-21 16:22:20 +01:00
rabuzarus
24a58ab2e6
frio: append bs tooltip to body element
2016-12-21 16:12:13 +01:00
Roland Haeder
bb06d9ce32
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:17:19 +01:00
Roland Haeder
54615be22e
Continued with coding convention:
...
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:16:01 +01:00
Roland Häder
a883514604
Opps, forgot this ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:23 +01:00
Roland Häder
c22878643b
Opps, forgot this ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:11 +01:00
Roland Häder
ace8f753ac
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
mod/bookmarklet.php
mod/community.php
mod/contacts.php
mod/crepair.php
mod/events.php
mod/network.php
mod/suggest.php
mod/uexport.php
view/theme/duepuntozero/config.php
view/theme/frio/config.php
view/theme/quattro/config.php
view/theme/vier/config.php
2016-12-20 11:59:13 +01:00
Roland Häder
e24c3a5b82
added much more curly braces + space between "if" and brace
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
Roland Häder
fb817b18ad
changed to this:
...
---------------------
function bla (App &$a) {
$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:59:06 +01:00
Roland Häder
884f44ce94
*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
Roland Häder
448c5aa694
Cleanup for #3010 - added spaces, thanks to @annando .
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:28 +01:00
Roland Häder
63610c7b73
Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/Photo.php
include/api.php
include/cache.php
include/dbstructure.php
include/enotify.php
include/items.php
include/onepoll.php
include/queue_fn.php
include/session.php
include/text.php
mod/contacts.php
mod/dfrn_request.php
mod/display.php
mod/events.php
mod/item.php
mod/message.php
mod/msearch.php
mod/photos.php
mod/poco.php
mod/profile.php
mod/proxy.php
mod/videos.php
update.php
view/theme/diabook/theme.php
view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
Roland Häder
6a8a36f12d
More usage of dbm::is_result($r) instead of count($r):
...
- count() returns very different results and never a boolean (not even false on
error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
done in PHP because of its lazyness. But it is discouraged if it comes to
more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
rabuzarus
7dcf44aa96
frio: delete unneeded button attributes in search forms
2016-12-10 21:25:40 +01:00
Tobias Diekershoff
a4959626ad
Merge pull request #2996 from rabuzarus/20161206_-_help_doc_move_content
...
docu docs: some polishing
2016-12-06 22:05:08 +01:00
rabuzarus
b65433c823
docu docs: some polishing
2016-12-06 15:03:57 +01:00
rabuzarus
11507440ae
frio: change some link behavior of user menu in the nav bar
2016-12-06 14:11:22 +01:00
Michael
d49325d177
Disable richtext editor for frio - followup for #2938
2016-11-29 20:04:31 +00:00
Michael Vogel
efb2df41ba
Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
...
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael Vogel
9894f7cea7
Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
...
active response
2016-11-28 21:14:42 +01:00
rabuzarus
3cb9324072
frio: some css work for help docs
2016-11-28 18:40:25 +01:00
Tobias Diekershoff
425bd83c8d
Merge pull request #2974 from rabuzarus/2511_frio_fix_default_js_arg
...
Frio Bugfix: correct wrong use of default arg 'title' in modal.js
2016-11-25 23:29:26 +01:00
rabuzarus
5068563cf5
small code formatting correction
2016-11-25 19:18:01 +01:00
rabuzarus
a194c44de9
Frio Bugfix: correct wrong use of default arg 'title' in modal.js
2016-11-25 19:13:40 +01:00
Hypolite Petovan
fac144e3d4
Add active response support to frost theme
...
- Add active classes to wall_thread.tpl
- Add styles
- Fix event icon not appearing at full opacity on hover
2016-11-22 18:42:37 +01:00
Hypolite Petovan
d406b17fe0
Remove extra whitespaces
2016-11-22 16:32:43 +01:00
Hypolite Petovan
9064277bd4
Add active response support to frio theme (continued)
...
- Added active class to search_item.tpl
2016-11-22 16:32:14 +01:00
Hypolite Petovan
3e4781172f
Add response active support to vier theme
...
- Add active class to wall_thread.tpl, search_item.tpl, photo_item.tpl
- Add style
Note: because of an !important in the Dark variant stylesheet, the
active links won't show up
2016-11-22 16:32:04 +01:00
Hypolite Petovan
e361536cd8
Added response active support to smoothly
...
- Added "self" class to wall_thread.tpl to avoid conflict with the
already existing "active" class
- Added style
2016-11-22 16:31:52 +01:00
Hypolite Petovan
92da411465
Add active response support to quattro theme
...
- Add active classes to wall_thread.tpl, search_item.tpl and
photo_item.tpl
- Add styles both in the master LESS file and the generated variant CSS
themes
2016-11-22 16:31:37 +01:00
Hypolite Petovan
b98f23dcd4
Added active response support to frost-mobile
...
- Added active class to wall_thread.tpl
- Added styles
- Fixed background-size declarations to be able to add padding to icons
2016-11-22 16:31:25 +01:00
Hypolite Petovan
065c12e652
Add active like style to duepuntozero
...
- Update general wall_thread.tpl
- Add specific styles for duepuntozero
2016-11-22 16:31:14 +01:00
Hypolite Petovan
a55c03896c
[frio] Enable Like Rotator on posts
...
- Move rotator from hidden block to post header
2016-11-22 16:31:01 +01:00
Hypolite Petovan
bdc7d1b87a
[frio] Add active class to responses current user holds
...
- Add active class when the self attribute is found
- Add CSS styling to active response links
2016-11-22 16:30:48 +01:00
Michael
7ad4a8ca93
The warning if a group contains members of several network types can now be supressed.
2016-11-20 12:09:18 +00: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
rabuzarus
1d8f18ff86
Bugfix: float for remote-friends-in-common wrapper
2016-11-19 21:14:28 +01:00
Tobias Diekershoff
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
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
rabuzarus
02a0269a67
Frio Bugfix: clear float at the end of comment-edit
2016-11-16 14:19:09 +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
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
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
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
rabuzarus
21b3037342
frio: improve readabillity for code blocks
2016-10-01 21:16:23 +02: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
Michael Vogel
196eb6009f
The XMPP address is now in the profile and will be transmitted
2016-09-25 15:28:00 +00:00
Michael Vogel
3f35fed35a
Special characters should be escaped
2016-09-23 06:29:02 +00:00
Roland Haeder
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
fabrixxm
3d6e3cbb78
Merge branch 'master' into develop
2016-09-13 17:19:57 +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
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
rabuzarus
83e95a5841
frio: highlight - test if the item is available in the dom
2016-08-10 14:42:57 +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
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
Tobias Diekershoff
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
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
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
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
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
Ben Roberts
864cf0f70d
update MF2 and vcard data for issue #2629
2016-06-21 10:23:43 -04:00
rabuzarus
80f5065eb0
frio: disable the events module link in the profile tab
2016-06-20 13:44:11 +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
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
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
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
fabrixxm
2ec06c1a38
use js/modal.js to show Login page in modal
2016-06-11 09:58:26 +02:00
fabrixxm
f8c62f0407
Frio: make jslint more happy
2016-06-11 09:40:50 +02:00
rabuzarus
70f97a3536
frio: a short contact informations - better fadeOut handling
2016-06-11 01:40:28 +02:00
rabuzarus
3c49a410e5
frio: a short contact informations - add border-radius to profile picture (this fits better to the rest of the profile pictures)
2016-06-11 01:32:29 +02:00
rabuzarus
53fb8b1181
frio: a short contact informations will be provided at the second nav bar by scrolling down (on pages where vcard is available)
2016-06-11 01:28:25 +02:00
rabuzarus
db5438ab1a
frio: improvements in search behavior
...
- search value woll be added to nav search input
- focus on nav search input as main search
- save search button appears in the second navbar if search is available
- search heading appears in the second navbar
- provide a mobile search by pressing the search icon
- dirfind: heading distinguish between people and form search
- some js fixes in theme.js
2016-06-10 20:34:25 +02:00
rabuzarus
3a9a9e6a1c
frio + core: some restructure in profiles.php + frio template for profiles settings
2016-06-10 11:24:38 +02:00
Fabrixxm
8c1422103e
Frio: login button opens a modal
2016-06-10 10:40:13 +02:00
rabuzarus
f79a7bc455
frio: improvements it js jot behavior
...
- cache the original jot everytime (to restore it after modal close)
- possibility to edit event items
2016-06-08 20:53:01 +02:00
Michael Vogel
f59b21d4a8
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
2016-06-07 22:40:29 +02:00
Michael Vogel
d034822f07
Merge pull request #2574 from rabuzarus/0607-saved-search
...
provide a general content wrapper + frio saved searches
2016-06-07 22:38:50 +02:00
Michael Vogel
e2e32eecac
New template for shared content instead of hardcoded stuff in source
2016-06-07 22:29:50 +02:00
rabuzarus
71b30e0651
profice a general content wrapper template.
2016-06-07 16:32:02 +02:00
rabuzarus
3a368214c0
frio: saved_searches_aside & searchbox template
2016-06-07 15:29:38 +02:00
Tobias Diekershoff
03c09e4c3f
Merge pull request #2573 from rabuzarus/0606-more-hovercard
...
frio: some hover-card css fixes
2016-06-07 11:32:56 +02:00
rabuzarus
60ca6b7f07
frio: some hover card css fixes (enable on mouseleave again - forgot it)
2016-06-07 10:16:31 +02:00
rabuzarus
d570a90c05
frio: some hover card css fixes
2016-06-07 10:13:08 +02:00
Michael Vogel
bd01a1c63a
Merge pull request #2572 from rabuzarus/0606-more-hovercard
...
frio: fix close hovercard on mousleave
2016-06-07 06:10:46 +02:00
rabuzarus
d752ea9abc
frio: fix close hovercard on mousleave
2016-06-07 01:42:01 +02:00
rabuzarus
615db43736
frio: add group_side widget template
2016-06-07 01:28:38 +02:00
rabuzarus
c87d426d5f
frio: follow & peoplefind widget template
2016-06-07 00:38:39 +02:00
Michael Vogel
db44ea0482
Merge pull request #2567 from rabuzarus/0606-photo-menu
...
photo_menu: now the photo_menu does have at all places the same struc…
2016-06-06 21:28:25 +02:00
rabuzarus
5c52736221
photo_menu: now the photo_menu does have at all places the same structure
2016-06-06 16:54:29 +02:00
rabuzarus
33ad8bdc53
frio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom mentions
2016-06-06 11:05:29 +02:00
rabuzarus
43b0550094
frio: remove legacy transition css
2016-06-05 17:12:13 +02:00
rabuzarus
84e5276a3a
frio: give the contact actions a little transition effect
2016-06-05 09:56:53 +02:00
rabuzarus
b53391a975
frio: fix bulk deletion doesn't appear if post item was inserted by js
2016-06-03 18:55:57 +02:00
rabuzarus
030f44b2fe
frio: give images in the networstream a little border-radius
2016-06-02 22:11:41 +02:00
rabuzarus
cd0d5d6a18
frio: remove js part for shared-content div because it's now done by core
2016-06-02 20:59:31 +02:00
rabuzarus
300591560e
frio: adding contact actions on hover for contacts in contact view
2016-06-01 17:21:57 +02:00
rabuzarus
64c871bf4c
frio: give the heading "messages" a class "heading" - This is needed for pm modal where class heading becomes the modal title)
2016-06-01 14:04:39 +02:00
rabuzarus
d3369aeca1
frio: provide a tooltip for nav search
2016-06-01 11:59:35 +02:00
rabuzarus
d663447e3c
frio: show tooltip only on hover (and not on focus)
2016-06-01 09:39:20 +02:00
Michael Vogel
e2c0f04eeb
Added short description to "mark as seen"
2016-06-01 07:05:44 +02:00
Michael Vogel
ef566ecbc3
Changed option description
2016-06-01 07:03:03 +02:00
Michael Vogel
9dd6fec0e0
The user name moved to the central.
2016-05-31 22:27:36 +02:00
Michael Vogel
9a442da852
Removed todo
2016-05-31 22:09:35 +02:00
Michael Vogel
de3eb5a1b7
Frio: Removed github link, changed notification description
2016-05-31 22:07:29 +02:00
Michael Vogel
060b7193e6
Indention of the html code
2016-05-30 21:43:49 +02:00
Michael Vogel
58ef15c6c1
The file widget looks now better as well
2016-05-30 21:17:28 +02:00
Michael Vogel
b798288a5b
Frio: The network widget now shows the selected network
2016-05-30 21:00:00 +02:00
Michael Vogel
7bfa9b5650
Merge pull request #2547 from rabuzarus/3005-frio_display_fix
...
frio: commented out some js for the color highlight in /display/ beca…
2016-05-30 15:06:16 +02:00
rabuzarus
3948e2923a
frio: commented out some js for the color highlight in /display/ because it causes some errors in ff
2016-05-30 15:01:30 +02:00
Tobias Diekershoff
2d280f55ac
Merge pull request #2544 from annando/issue-1769
...
Issue 1769: Some enhancements for sending wall mails
2016-05-30 14:35:04 +02:00
Michael Vogel
5218667196
Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean
2016-05-30 07:24:06 +02:00
Michael Vogel
7e6598f2c0
Adopted the changes to the other themes as well.
2016-05-30 07:18:25 +02:00
Tobias Diekershoff
b2c6bf0078
Merge pull request #2543 from annando/frio-hovercard
...
Frio: Hovercard is now a core function
2016-05-30 06:25:29 +02:00
Michael Vogel
ecb67feca1
Adapting the changes to search_item.tpl as well
2016-05-30 05:21:57 +02:00
Michael Vogel
09931b7124
frio: Some small template clean up
2016-05-29 23:42:22 +02:00
Michael Vogel
47efc6df63
Frio: The separator dots are enabled again
2016-05-29 23:02:48 +02:00