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
rabuzarus
898761b4a0
Show mobile theme selection only if mobile themes are available (default template)
2017-01-07 00:22:22 +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
Tobias Diekershoff
8f0ca51a55
Merge pull request #3065 from rabuzarus/20170103_-_frio_fix_nav_help_string
...
Bugfix: Frio - use "Help" instead of "Help And Documentation" as label in the nav user menu
2017-01-04 13:52:51 +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
Tobias Diekershoff
b783a98a9f
DE translations THX Rabuzarus
2017-01-03 10:42:11 +01:00
rabuzarus
5bef39189b
Bugfix: Frio css - add z-index to badges
2017-01-02 13:38:10 +01:00
Tobias Diekershoff
e301dc7607
ES translation of the core
2017-01-02 08:22:52 +01:00
Tobias Diekershoff
e74cee1e42
DE translation of the core
2017-01-02 08:22:39 +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
a6d7ad0755
Update cache on photo edit only when album name has changed
2016-12-26 02:41:00 +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
Michael Vogel
52f12ee28d
Merge pull request #3010 from Quix0r/rewrites/mixed-static-object-reference-calls
...
Rewrites: mixed static object reference calls (and very sadly more ...)
2016-12-19 14:12:50 +01:00
Tobias Diekershoff
85dec3cf30
DE translation of the core
2016-12-19 12:22:47 +01:00
Roland Häder
ff569756ee
Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
...
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/follow.php
2016-12-19 09:40:34 +01:00
Michael
bc323b0bfa
OStatus: Follow/Unfollow should now work again.
2016-12-18 17:10:38 +00: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
dd8d797d9f
Fixes for #3010 - removed baseurl as this is no longer done, still there are 89
...
left in templates.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:34:13 +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
132477990d
move that option up, as the admin panel has no control over it ATM
2016-12-10 07:16:16 +01:00
Tobias Diekershoff
89caa18fe0
add the kickstart allowed protocols to htconfig.tpl. 2932 follow-up
2016-12-10 07:05:35 +01:00
Michael Vogel
af42e5e481
Merge pull request #2932 from Hypolite/issue/missing-private-image-src
...
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
Tobias Diekershoff
3512c87e64
DE, ES update to the translation
2016-12-09 12:36:28 +01:00
Hypolite Petovan
88e336b3bc
Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
...
# Conflicts:
# doc/htconfig.md
2016-12-07 23:15:46 -05: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
Michael Vogel
9457d30751
Merge pull request #2994 from tobiasd/20161206-frontendworker
...
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 22:01:29 +01:00
Tobias Diekershoff
71cfe6db94
show some of the worker options only when the worker process is active
2016-12-06 21:47:37 +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
Tobias Diekershoff
ac5617c40c
add frontend worker to the admin panel and regen master messages.po file
2016-12-06 08:44:59 +01:00
Hypolite Petovan
979fc6d38a
Add protocol whitelist for href/src attributes
...
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
2016-12-03 14:19:57 -05:00
Tobias Diekershoff
7ecc0a063c
Update DE translation THX Rabuzarus
2016-12-03 10:09:40 +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
Tobias Diekershoff
01b46f5ec0
ES translation of the core THX Albert
2016-11-21 18:35:17 +01:00
Tobias Diekershoff
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
Tobias Diekershoff
b03009d962
use an array for warnings in admin panel
2016-11-20 16:14:09 +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
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
Tobias Diekershoff
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
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
Tobias Diekershoff
b95bf00e89
Additional info in registration request
2016-11-19 18:22:49 +01:00