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
16f0221e4c
DBClean now has a smaller limit/Query improvements
2017-01-09 09:37:37 +00:00
Hypolite Petovan
af4e6a36d4
Fix overzealous quote replace
2017-01-09 12:25:52 +11: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
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
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
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
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
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
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
e301dc7607
ES translation of the core
2017-01-02 08:22:52 +01:00
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
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
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
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
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
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
8b7d5d0efc
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
2016-12-22 09:06:00 +01:00
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
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
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
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
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
a883514604
Opps, forgot this ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:23 +01:00
c22878643b
Opps, forgot this ...
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 12:38:11 +01:00
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
