Michael
f6d7ee2781
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 08:28:42 +00:00
Roland Häder
60552260e1
Continued with CR:
...
- added spaces as requested
- removed parentheses from include/require calls as they are no functions
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-31 21:04:39 +02:00
Roland Häder
5bc2ebb267
Please use x() correctly:
...
<?php
if (x($someArray, 'element')) {
// Do something
}
?>
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-30 21:37:08 +02:00
Hypolite Petovan
109f851795
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
2017-03-28 03:14:03 -04:00
Tobias Diekershoff
4720778edc
ES translation THX Albert
2017-03-27 22:06:56 +02:00
Hypolite Petovan
909439e59f
Fix contacts "View" link color
...
- Fixed whitespaces in `event.tpl`
2017-03-26 19:22:19 -04:00
rabuzarus
5e54fb3a5f
css: border for images, min-with for folders list
2017-03-26 14:00:00 +02:00
Hypolite Petovan
9375438216
Restore separator margins
2017-03-25 22:58:17 -04:00
Hypolite Petovan
8db4437ed7
Restores bold text for text dropdown button
2017-03-25 21:33:34 -04:00
Hypolite Petovan
fa9ce4721a
Fix superfluous comment box top margin
2017-03-25 21:29:13 -04:00
Hypolite Petovan
c01c7ad746
Fix .btn-link hover/focus color
2017-03-25 21:28:53 -04:00
Hypolite Petovan
5b7c8d8631
Fix indent in search_item.tpl
2017-03-25 20:45:03 -04:00
Hypolite Petovan
359c246ef9
Various fixes
...
- Removed superfluous CSS rule
- Fixed whitespace
- Restored separators in search_item.tpl
2017-03-25 20:43:33 -04:00
Hypolite Petovan
d7f80bf7e7
Merge branch 'develop' into improvement/frio-action-links-to-buttons
...
# Conflicts:
# view/theme/frio/js/filebrowser.js
# view/theme/frio/templates/filebrowser.tpl
2017-03-25 20:27:26 -04:00
rabuzarus
aeb999c4d9
enable fbrowser for mobile view
2017-03-25 23:33:53 +01:00
Hypolite Petovan
632d77cfb1
Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser
...
Bugfix: fbrowser did insert 2 Pictures instead of only 1
2017-03-25 16:13:31 -04:00
rabuzarus
8bbf43b9dd
Remove the AjaxUpload element when jot modal is closed
2017-03-25 21:10:57 +01:00
Hypolite Petovan
d78acd5408
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
2017-03-25 16:09:46 -04:00
Michael
18a2b48d1d
Remove unneeded linefeeds
2017-03-25 19:31:32 +00:00
rabuzarus
a2ad013830
some work on code standards compliance
2017-03-25 19:12:16 +01:00
Michael
0d49143a63
"no_utf" wasn't in use anymore - it is now removed completely
2017-03-25 10:51:00 +00:00
Hypolite Petovan
29fb28de43
Remove Embedly integration
...
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Hypolite Petovan
b9f4a6e4f0
Code cleanup + standards
2017-03-25 01:54:16 -04:00
Hypolite Petovan
85144908fa
Improve display feedback on like actions
...
- Move rotator in sight
- Preventively change display class before next item update
2017-03-23 22:47:56 -04:00
Hypolite Petovan
87bf6d39dd
More display fixes
...
See
https://github.com/friendica/friendica/pull/3204#issuecomment-288908490
2017-03-23 22:45:40 -04:00
Hypolite Petovan
991b62784a
Remove spaces confusing jSmart in contact_template
...
- Fix two missing button closing tags
2017-03-21 22:39:29 -04:00
rabuzarus
835e54dfc3
upload images to the selected album
2017-03-21 23:08:37 +01:00
rabuzarus
2633e820ab
remove upload file from jot because it's now in the browser included
2017-03-21 21:18:27 +01:00
rabuzarus
9acfbae6ea
add justified-gallery to fbrowser
2017-03-21 20:39:31 +01:00
Hypolite Petovan
7b352f3f74
Revert "Coding convention applied - part 1"
2017-03-21 12:02:59 -04:00
rabuzarus
af8bd4b45f
frio: gui work for fbrowser + switch between image and file mode
2017-03-21 03:35:25 +01:00
rabuzarus
c8a427804e
Bugfix: fbrowser did insert 2 Pictures instead of only 1
2017-03-20 22:45:24 +01:00
Roland Häder
09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-20 20:51:32 +01:00
Hypolite Petovan
8a0b057dc7
Merge branch 'develop' into improvement/frio-action-links-to-buttons
2017-03-20 14:43:37 -04:00
rabuzarus
0060e2449e
Merge develop into 20170316_-_fix_event_edit
...
Conflicts:
mod/events.php
2017-03-20 16:46:36 +01:00
Hypolite Petovan
46c5b3b419
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
2017-03-19 21:12:20 -04:00
Michael
8dd732a896
Issue 3242: Define a maintenance reason
2017-03-19 13:24:07 +00:00
Roland Häder
fef61a28cc
fixed chmod
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
d9c22c7f3e
Continued a bit:
...
- converted some else if to elseif (only PHP)
- converted some space -> tab (intending)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
c2d8738285
added spaces (coding convention)
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Hypolite Petovan
8d6d008d28
Fix frio style.css indentation
2017-03-17 20:46:31 -04:00
Hypolite Petovan
20406aacec
All-around CSS display fixes
2017-03-17 20:28:31 -04:00
Hypolite Petovan
2e17885eb3
Fix jot display
2017-03-17 20:28:09 -04:00
Hypolite Petovan
80510ef4ca
Fix group_side display
2017-03-17 20:28:00 -04:00
Hypolite Petovan
d1a1dfe879
Fix profile display
2017-03-17 20:27:43 -04:00
Hypolite Petovan
03700d4ae5
Fix contact display
2017-03-17 20:27:31 -04:00
Hypolite Petovan
92a755f688
Fix event display
2017-03-17 20:27:17 -04:00
Hypolite Petovan
29936060cf
Fix filebrowser display
2017-03-17 20:26:40 -04:00
rabuzarus
3cef98caf6
Merge pull request #3226 from annando/1702-only-worker
...
The worker is now the only background processing system
2017-03-17 13:22:23 +01:00
Hypolite Petovan
8ac8d779f6
Fix bulk drop button
2017-03-16 22:19:45 -04:00
Hypolite Petovan
67c40bf030
Fix "Mark all as seen" button display
2017-03-16 22:19:27 -04:00
rabuzarus
8ae8465d48
add dop event & fix event edit
2017-03-16 20:15:25 +01:00
Hypolite Petovan
802897c0ab
Restored tabs display until a more complete CSS solution is worked out
2017-03-15 22:00:37 -04:00
Hypolite Petovan
214c76fec7
Reverted original display for item action links + jot bbcode buttons
...
- Cleaned useless CSS
2017-03-15 22:00:07 -04:00
Hypolite Petovan
077c4cadf1
Merge branch 'develop' into improvement/frio-action-links-to-buttons
2017-03-15 21:10:11 -04:00
rabuzarus
b4bad92657
Merge pull request #3239 from Hypolite/issue/#3194-2
...
Fix wrong deferred function name
2017-03-15 19:53:16 +01:00
Hypolite Petovan
35ba3cce70
Fix wrong deferred function name
2017-03-15 14:42:34 -04:00
Hypolite Petovan
82ce1a449b
Revert jot tabs to links due to Bootstrap not supporting button styling
2017-03-15 07:24:14 -04:00
Hypolite Petovan
30049d862c
Fix comment double-posting
2017-03-15 07:07:06 -04:00
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
fabrixxm
fa3490ba5b
Merge pull request #3224 from annando/1702-no-old_pager
...
The old pager is now removed
2017-03-14 10:29:03 +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
Tobias Diekershoff
dfc5dc2e9e
Merge pull request #3223 from annando/1702-no-language
...
The language string isn't displayed anymore
2017-03-13 08:26:43 +01:00
Michael
77e8c44016
Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
...
Conflicts:
include/onepoll.php
include/queue.php
2017-03-12 21:03:44 +00:00
Michael
259598e569
Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share
2017-03-12 20:52:48 +00:00
Michael
044e9a6603
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
...
Conflicts:
mod/profile.php
2017-03-12 20:52:14 +00:00
Michael
b6a4a2ec7f
Merge remote-tracking branch 'upstream/develop' into 1702-no-language
2017-03-12 20:50:20 +00:00
Tobias Diekershoff
4cddb74f27
Merge branch 'master' into develop
2017-03-12 14:39:09 +01:00
Tobias Diekershoff
5097c74d21
DE translations
2017-03-05 12:40:31 +01:00
Hypolite Petovan
3ea830e221
Strip @hubzilla.server part from guid for autoscrolling purpuses
2017-03-03 21:45:36 -05:00
Tobias Diekershoff
1d667d7a45
tag change
2017-03-03 17:18:09 +01:00
Tobias Diekershoff
2fa9f76e67
better wording and placeholder for name
2017-03-03 10:28:29 +01: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
Hypolite Petovan
a3cd804ff1
Fix default paginate.tpl
...
Adding missing curly braces
2017-03-01 23:23:14 -05:00
Michael
cc86d8ea14
Language data won't be displayed anymore (it was experimental stuff)
2017-02-27 23:59:05 +00:00
Michael
997e94555b
The old pager is removed
2017-02-27 21:46:37 +00:00
Michael
39386ded36
"old_share" is removed
2017-02-27 21:26:37 +00:00
Michael
99fb15037b
Removed some more unneeded stuff
2017-02-27 06:27:22 +00:00
Michael
48209f0ecd
Now there is only the worker.
2017-02-26 23:16:49 +00:00
Tobias Diekershoff
7442ce3d6d
change Fan/Admirer to Subscriber
2017-02-26 16:47:11 +01:00
Michael
cec79ddf2b
See issue 3157: Fulltext is now disabled
2017-02-21 05:23:37 +00:00
rabuzarus
4264518859
Merge pull request #3170 from tobiasd/20170217-de
...
DE translations
2017-02-18 15:20:14 +01: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
Tobias Diekershoff
5e46b8315a
DE translations
2017-02-17 10:14:38 +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
Michael Vogel
043449c24b
Merge pull request #3164 from tobiasd/20170215-quattro
...
fix for less file of quattro, regen CSS
2017-02-16 06:26:54 +01:00
Tobias Diekershoff
7e1f51b0f9
SV update to the strings
2017-02-15 08:13:06 +01: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
d27c8f4932
fix oembeded video floating
2017-02-08 02:18:42 +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
Tobias Diekershoff
94694aae86
RInO is not true / false anymore
2017-02-01 08:45:13 +01:00
rabuzarus
ec4e60ce3a
style the photo album page of the vier theme
2017-01-30 15:00:26 +01:00
Tobias Diekershoff
4b2f6138a4
smoothly is also allowed
2017-01-28 11:08:05 +01:00
Tobias Diekershoff
d6e81117f9
system -> allowed_themes was not set in htconfig template
2017-01-28 08:26:40 +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
Michael Vogel
d61a4a67db
Merge pull request #3109 from Hypolite/issue/scrap-tinymce
...
Scrap TinyMCE
2017-01-27 21:08:33 +01:00
Tobias Diekershoff
e5f0ba3407
update to the translation
2017-01-27 13:31:51 +01:00
Tobias Diekershoff
4523753455
update to the translations
2017-01-27 13:31:04 +01: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
Fabio
81529a43ad
Update IT strings
2017-01-18 12:38:09 +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
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
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 Häder
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 Häder
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 Häder
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 Häder
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 Häder
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 Häder
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
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
Tobias Diekershoff
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
Tobias Diekershoff
deaf82cfd0
DE translation of the core THX Andreas
2016-11-13 11:23:19 +01:00
Tobias Diekershoff
6657302602
DE translation of the core
2016-11-10 10:28:20 +01:00
Tobias Diekershoff
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