strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
19670 commits 2 branches 55 tags 148 MiB
Commit graph

4951 commits

Author SHA1 Message Date
Tobias Diekershoff 8654b028ec DE translations 2017-07-12 08:26:26 +02:00
Michael Vogel 896bf4046c Merge pull request #3569 from tobiasd/20170702-delete 
delete item from admin panel
 2017-07-10 18:44:19 +02:00
Tobias Diekershoff d88584af69 Merge pull request #3567 from rjm6823/develop 
Contacts page directory link
 2017-07-08 08:36:54 +02:00
Tobias Diekershoff d535864d98 added template for delete item 2017-07-07 10:37:36 +02:00
Tobias Diekershoff 1e0f4c2f70 DE and ES translations 2017-07-07 08:43:10 +02:00
RJ Madsen fec2f8fd82 Replacing quotes around new directory link 2017-07-06 17:56:18 -04:00
RJ Madsen c4b40babb0 Switched to proper global directory instead of local directory 2017-07-06 17:31:36 -04:00
RJ Madsen 255f38710c Added global directory link to the find people side panel 2017-07-06 14:19:58 -04:00
Michael Vogel 2b161108fe Merge pull request #3439 from tobiasd/20170506-token 
[Needs OpenID testing] Add token to register
 2017-07-02 21:31:53 +02:00
Tobias Diekershoff e515c20cbc DE translations 2017-06-30 08:24:45 +02:00
Andy H 0f604538ba EN-GB and EN-US Translations 2017-06-26 18:03:32 +07:00
Andy H afa7421aa2 DE Translation 2017-06-26 17:43:00 +07:00
Andy H bee466532f DE Translation 2017-06-26 17:31:12 +07:00
Tobias Diekershoff 6672dcc36f DE translations 2017-06-26 11:07:18 +02:00
Tobias Diekershoff e0c46678e5 autofocus for search input field 2017-06-24 10:17:16 +02:00
Tobias Diekershoff 45ef0a9ee0 DE translations 2017-06-19 17:03:08 +02:00
Roland Häder 4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-06-13 23:26:06 +02:00
Tobias Diekershoff 1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Hypolite Petovan ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Tobias Diekershoff a9b948d6f9 added hints how to specify a port for the database connection 2017-06-08 15:00:50 +02:00
Hypolite Petovan 9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael 6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
Michael 932e14971f Issue 2864: Add a "alternate" link on display page 2017-06-06 17:56:22 +00:00
Tobias Diekershoff f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
Tobias Diekershoff 796efa119f Merge pull request #3520 from AndyHee/3.5.2rc 
Correcting path for en-gb and en-gb translations core
 2017-06-06 09:27:25 +02:00
Andy H b59ca39d32 Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php 2017-06-06 13:00:20 +07:00
Andy H 0322ed4dbc Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po 2017-06-06 12:58:59 +07:00
Andy H 2529552809 Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php 2017-06-06 12:58:20 +07:00
Andy H a0b0e38c28 Rename view/lang/en-GB/messages.po to view/lang/en-gb/messages.po 2017-06-06 12:57:08 +07:00
Tobias Diekershoff cdc0eab49d ES translation THX Albert 2017-06-06 07:11:27 +02:00
Tobias Diekershoff af41e5ed83 Merge pull request #3518 from AndyHee/3.5.2rc 
Update EN-GB Translation Core + Create EN-US Translation core
 2017-06-06 06:56:02 +02:00
Andy H 379a01a1c5 Update messages.po 2017-06-05 22:22:16 +07:00
Andy H 098ef3de99 Create strings.php 2017-06-05 22:21:31 +07:00
Andy H a7403349bc Create messages.po 2017-06-05 22:20:27 +07:00
Andy H 757bf75493 Update strings.php 2017-06-05 21:37:56 +07:00
Andy H 887e309e85 Update messages.po 2017-06-05 21:36:26 +07:00
Hypolite Petovan cbd3edbc05 Update remaining "dir.friendi.ca" instances 2017-06-02 22:15:43 -04:00
Tobias Diekershoff 47bd3243cd Merge pull request #3500 from AndyHee/3.5.2rc 
Update EN-GB translation core
 2017-05-29 11:18:42 +02:00
Andy H 29560a3d06 Update strings.php 2017-05-29 15:36:12 +07:00
Andy H 3e68feb315 Update messages.po 2017-05-29 15:35:04 +07:00
Tobias Diekershoff 67ae517406 DE translations 2017-05-29 07:21:42 +02:00
Tobias Diekershoff c74f144f15 RU translations THX Frederico Gonçalves Guimarães 2017-05-27 09:35:23 +02:00
Tobias Diekershoff 226c7f7910 RU translations THX pztrn 2017-05-27 09:09:41 +02:00
Michael Vogel 0cc15f5c3d Merge pull request #3481 from Hypolite/issue/#3480 
Remove special case of "url" from insertFormatting
 2017-05-24 07:20:07 +02:00
Andy H cebe1c00db EN-GB Translation 2017-05-23 22:05:34 +07:00
Andy H 9ee4532936 Create messages.po 
British English localisation that aims to address various issues in the source, including consistent spelling, appropriate level of capitalisation, succinct wording, and user-centred phrases at basic level.
 2017-05-23 20:05:40 +07:00
Michael Vogel e5429b2d17 Merge pull request #3483 from rabuzarus/20170522_-_frio_event_button_fix 
Bugfix: fix frio's event dropdown color
 2017-05-22 17:55:28 +02:00
rabuzarus dc76e81d3e Bugfix: fix frio's event dropdown color 2017-05-22 14:44:51 +02:00
Hypolite Petovan d14da1214c Remove special case of "url" from insertFormatting 2017-05-21 13:41:28 -04:00
Hypolite Petovan 88e5e06b45 Standards 2017-05-21 13:40:51 -04:00
Hypolite Petovan 87e7fac397 Frio: Fix hubzilla scrollToItem 
- Removed unnecessary item guid truncation
 2017-05-20 13:18:20 -04:00
rabuzarus 5c9033a7e2 Frio: some correction in grammar/expression - thx Hypolite 2017-05-19 13:32:55 +02:00
rabuzarus 3cb5c83fca Frio: a word was missing in the README 2017-05-19 13:18:27 +02:00
rabuzarus 58260021b6 Frio: remove experimental flag + rise version number to 0.8 2017-05-19 13:11:30 +02:00
Tobias Diekershoff fd5d058156 Merge pull request #3472 from rabuzarus/feature/frio/fixedaside2 
Frio: better UX for aside bar
 2017-05-17 11:27:37 +02:00
rabuzarus 4a47361116 Merge pull request #3380 from fabrixxm/feature/frio/fixedaside2 
Frio: better UX for aside bar
 2017-05-16 17:31:06 +02:00
Tobias Diekershoff 3fb99e74d8 IT translations THX fabrixxm 2017-05-16 07:39:38 +02:00
Roland Häder 7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
fabrixxm 61e8147daf Frio: recalculate sticky aside on click only on a tags 
This to prevent input elements in aside to lose focus after the
recalculation.
 2017-05-09 14:53:56 +02:00
rabuzarus 757f3a3f5d Bugfix: frio - make register tooltip work 2017-05-08 19:39:06 +02:00
fabrixxm d162e689da frio mobile: disable page scroll when aside is shown 2017-05-08 15:14:31 +02:00
Hypolite Petovan 86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Tobias Diekershoff dacef3683a add token to register 2017-05-06 14:49:53 +02:00
Tobias Diekershoff 3dc938d2e9 DE translations 2017-05-06 08:56:15 +02:00
rabuzarus 0135b7e357 Merge pull request #3417 from fabrixxm/feature/frio/admintemplates 
Frio: admin aside template and generic_links_widget
 2017-05-04 15:33:24 +02:00
Hypolite Petovan dfd4c8528e Add new documentation page about moving classes to src 2017-05-02 23:37:40 -04:00
Hypolite Petovan 1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan 4b16de6d80 Fix wrong class name case 
- Use leading backslash for non-namespace class names in App
 2017-05-02 23:36:46 -04:00
Hypolite Petovan 20043914e6 Move App to src 
- Add `use Friendica\App;` wherever needed
 2017-05-02 22:59:36 -04:00
Hypolite Petovan 56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
fabrixxm 588f87bf79 Standards 2017-05-01 18:25:56 +02:00
Tobias Diekershoff 2c0e76f2cc DE translations 2017-05-01 08:23:01 +02:00
Michael 715e15cbe1 There is now a memory limit for the poller 2017-04-29 17:36:46 +00:00
Hypolite Petovan 2c9c867393 frio: Fix typo in various button callbacks 2017-04-28 21:50:09 -04:00
Michael ba5780c4a1 Remove the "discard" button for contact requests from Diaspora. 2017-04-28 08:36:10 +00:00
fabrixxm 57366e391f frio: admin aside template 2017-04-27 21:25:53 +02:00
fabrixxm 7bed3e909a frio: hilight selectet item in generic_links_widget.tpl 
Add a custom generic_links_widget.tpl.
The class ".selected" is add to `li` instead of `a`,
hilighting current item, e.g. in user settings aside.
 2017-04-27 19:34:01 +02:00
fabrixxm 1da4b9d942 frio: add comment note about sticky aside hack 2017-04-27 19:21:14 +02:00
fabrixxm 0ffe426ff1 Frio: Enable stiky aside only on desktop-size windows. 
"Hack" to fix the "scroll back to top" problem with
chrome-based browsers, sticky-kit and off-canvas aside
 2017-04-27 08:39:35 +02:00
fabrixxm 0afc732059 frio mobile aside: add overlay transition 2017-04-26 10:16:39 +02:00
fabrixxm bd4ce2daee mobile aside: max-width and transparent overlay 
fix maximum aside with in mobile screen at 300px.
This way the aside will not cover all the screen.
The area not covered by aside element are dimmed by a semi-transparent overlay
 2017-04-26 08:58:45 +02:00
fabrixxm ea9d44c20a Fix sticky aside when height change 2017-04-26 08:56:47 +02:00
Hypolite Petovan 7d9d22914f Refactor "URL" to "domain" for blocklist 
- Add slash trimming to domain
- Reformatted mod/friendica
 2017-04-25 22:45:42 -04:00
Hypolite Petovan 0b8f80c747 Merge pull request #3388 from tobiasd/20170424-blocklistadminpanel 
blocklist front end for the admin panel
 2017-04-25 21:23:20 -04:00
Tobias Diekershoff f146c85e75 standards 2017-04-25 18:57:50 +02:00
Hypolite Petovan 82ea7ead66 Merge pull request #3374 from rabuzarus/20170407_-_group_edit 
Frio: provide own group template + some restructuring in group.php
 2017-04-24 19:50:46 -04:00
Tobias Diekershoff 1a436281c5 added template for the blocklist editor in the admin panel 2017-04-24 23:44:27 +02:00
rabuzarus 20a53e14ca add a visual indicator (fade) on group membership change 2017-04-23 15:26:26 +02:00
rabuzarus e7914ecc95 add $contact.change_member to the js template. At the present time we don't make use of it, but the js smarty template should be the same as the php smarty template 2017-04-23 14:58:23 +02:00
rabuzarus 46291b2e2b fix smarty PHP warnings 2017-04-23 14:51:41 +02:00
fabrixxm e569e20caf Frio: sitck aside on page scroll 
use sticky-kit jquery library to keep aside inside viewport
when user scrolls the page.
 2017-04-22 20:36:48 +02:00
fabrixxm 5b731a60ae Frio: Fix aside in mobile view 
Aside is fixed to cover page, without the need to scroll back top to see it.
 2017-04-22 20:34:52 +02:00
Sandro Santilli e08228ca09 Add auth_cookie_lifetime variable to installation config template 2017-04-21 17:19:58 +02:00
rabuzarus f99bb958f6 Merge develop into 20170407_-_group_edit 
Conflicts:
	mod/group.php
 2017-04-21 16:09:48 +02:00
rabuzarus 40e5436604 some restructuring in groups.php + Frio: provide own group template 2017-04-21 16:04:29 +02:00
Michael 3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon 
Conflicts:
	include/bbcode.php
 2017-04-20 05:44:31 +00:00
Michael Vogel 83cc56e713 Merge pull request #3326 from Alkarex/utf8mb4 
Default to utf8mb4
 2017-04-20 05:28:16 +02:00
Pierre Rudloff 8549da4f7b Make standalone tweaks work with infinite scrolling 2017-04-19 23:51:18 +02:00
Michael e16fb74b0c Reworked OStatus communication part to better support Mastodon. 2017-04-19 21:37:00 +00:00
Pierre Rudloff 2ea2c4b87b In standalone mode, open links to source in a new tab (fixes #3359) 2017-04-19 23:27:11 +02:00
Alexandre Alapetite 6cc4f8b0a9 Delete frio dynamic.php 
https://github.com/friendica/friendica/pull/3326#discussion_r112116929
 2017-04-19 21:44:13 +02:00
Hypolite Petovan f15bb6c516 Add autosize call for all external textarea value changes 2017-04-18 22:04:23 -04:00
Hypolite Petovan 5c3abe0ca6 Prevent comment UI from closing when using BBCode buttons with empty textarea 2017-04-18 22:03:49 -04:00
Michael 33d5e5b818 Issue 3157: No fulltext anymore 2017-04-18 20:09:05 +00:00
rabuzarus 6a7a4591d3 Merge pull request #3333 from Rudloff/feature/theme-color 
theme-color meta
 2017-04-17 13:51:37 +02:00
Pierre Rudloff 6cd6e886db Updated theme-color code 
Add comment explaining what the code does
Remove unused include
Code standards
 2017-04-17 13:38:55 +02:00
Alexandre Alapetite 5d3bf9307f More replaces UTF8 to UTF8MB4 2017-04-16 15:53:48 +02:00
Tobias Diekershoff a0a0885527 Merge pull request #3339 from Hypolite/issue/#2803-icons 
Change icon of contact page links
 2017-04-14 07:35:16 +02:00
Tobias Diekershoff b8fd48dddc Merge pull request #3335 from annando/issue-3331 
Issue 3331: Remove unneeded table "deliverq"
 2017-04-14 07:32:30 +02:00
Hypolite Petovan 440fd29c1e Change icon of contact page links 2017-04-13 23:00:02 -04:00
Pierre Rudloff ead9cbe534 Web app manifest (fixes #3317) 2017-04-13 16:46:36 +02:00
Pierre Rudloff d0407f8b76 theme-color meta 2017-04-13 12:03:02 +02:00
Michael d82684219a Issue 3331: Removed unneeded table "deliverq" 2017-04-13 04:51:16 +00:00
Tobias Diekershoff dad89a125a RU translations THX pztrn 2017-04-09 07:35:12 +02:00
Hypolite Petovan 472345d740 Merge branch 'develop' into space_before_t 2017-04-08 23:17:31 -04:00
rebeka-catalina 554704e6b9 Added a whitespace between comma and t() 2017-04-08 16:57:24 +02:00
Tobias Diekershoff 42cc8d729b Merge pull request #3306 from Hypolite/issue/#3274 
Fix path to default Text_Highlighter CSS
 2017-04-08 15:24:16 +02:00
Hypolite Petovan 318166a381 Fix path to default Text_Highlighter CSS 2017-04-08 08:59:41 -04:00
rabuzarus c65fc6f8de Bugfix: there was a gui issue on the navbar account dropdown button 2017-04-08 13:30:16 +02:00
Tobias Diekershoff fb94a0add7 the Quattro admin_user template was missing the users note for the admin 2017-04-07 12:59:22 +02:00
rabuzarus a9b3696560 Bugfix: bulk deletion button was not available anymore 2017-04-07 11:35:45 +02:00
Hypolite Petovan cfb99aa323 Merge pull request #3266 from rabuzarus/20170321_-_frio-fbbrowser 
frio: fbrowser styling
 2017-04-07 00:01:46 -04:00
Sandro Santilli 27cce1e6dc Add type="text" attribute for openid input field 2017-04-06 21:48:20 +02:00
rabuzarus c3b975e516 change fbrowser image margin and box-shadow 2017-04-05 12:46:09 +02:00
rabuzarus 190b03e706 add aria attributes for filebrowser 2017-04-05 12:34:00 +02:00
rabuzarus 0542cd6a14 add aria attributes + restructure some js to change the aria attributes 2017-04-05 11:46:42 +02:00
rabuzarus dd919b7f80 small css fix 2017-04-03 15:04:54 +02:00
rabuzarus 0bb1466723 use buttons for mobile jot nav 2017-04-03 14:32:54 +02:00
rabuzarus 0b280219c6 use box-shadow instead of border 2017-04-03 14:20:34 +02:00
rabuzarus 9f37acc6d4 add href attribute to jot links 2017-04-03 14:00:27 +02:00
rabuzarus 036c18be7b use height: 0 instead of display: none to hide jot sections 2017-04-03 13:38:07 +02:00
rabuzarus 68659c7740 add missing overflow to css 2017-04-03 12:55:06 +02:00
rabuzarus 4dfdbeba54 fix max-height for screens bigger than 768px 2017-04-03 12:46:31 +02:00
Hypolite Petovan 9237b2611a Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-03 06:35:27 -04:00
rabuzarus 80f5a026be re-enabel browser for small screens 2017-04-03 02:04:13 +02:00
rabuzarus ee293f2ce2 Merge develop into 20170321_-_frio-fbbrowser 
Conflicts:
	view/theme/frio/js/filebrowser.js
	view/theme/frio/js/theme.js
	view/theme/frio/templates/filebrowser.tpl
	view/theme/frio/templates/jot.tpl
 2017-04-03 00:51:34 +02:00
rabuzarus 1ce5cc1b49 Merge pull request #3204 from Hypolite/improvement/frio-action-links-to-buttons 
Frio: Turn action links into buttons
 2017-04-02 23:15:57 +02:00
Michael Vogel d9451ef969 Merge pull request #3279 from Hypolite/improvement/add-composer 
Add Composer
 2017-04-02 14:57:37 +02:00
Hypolite Petovan 7606ac5e32 frio: Fix help pages inline code display 2017-04-01 17:58:35 -04:00
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
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
Hypolite Petovan 3358b55433 [frio] Fix unescaped calendar Javascript strings 
In French, “today” is “aujourd’hui”, which breaks the current calendar
Javascript strings quoted declaration.

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

Fixes 1. of #2800
 2016-10-01 18:19:43 -04:00
rabuzarus 21b3037342 frio: improve readabillity for code blocks 2016-10-01 21:16:23 +02:00
Tobias Diekershoff 82dcc3fe79 Merge pull request #2821 from Hypolite/Issue-#2817 
Fix #2817 - Move translation language folder in a subfolder of view
 2016-10-01 10:58:32 +02:00
Hypolite Petovan 76b1b109e5 Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing 
- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing
 2016-09-30 23:26:22 -04:00
Hypolite Petovan 5a5284b94e Fix #2817 
- Move translation folders under `view/lang`
 2016-09-30 10:45:47 -04:00
Hypolite Petovan f4c2e2244d Fix #2814 
- [frio] Add a wrapping `a` tag around the notification text
- Add an event listener preventing popup menus to close when they are
themselves clicked
 2016-09-29 23:46:43 -04:00
Hypolite Petovan a05a425448 [frio] Capitalize Jot tabs title 
- Revert translation term change for "permissions"
 2016-09-28 21:09:03 -04:00
Hypolite Petovan 24969d79d8 [frio] Capitalize dropdown menu links 2016-09-28 20:59:54 -04:00
Hypolite Petovan b99b0ad931 [frio] Capitalize a few terms for consistency 
- Changed the translation term "permissions" because only frio is using
it
- Changed the vote links style because it is shared with other themes
 2016-09-28 20:53:25 -04:00
Hypolite Petovan 34acfa1706 [frio] Fix whitespace style.css 2016-09-28 20:51:56 -04:00
rabuzarus af3a672570 Merge pull request #2807 from Hypolite/frio-larger-view-develop 
[frio] Changes to shared post display (width, base font size)
 2016-09-28 20:32:11 +02:00
Hypolite Petovan ed5e46892d Set block quote size to current text-size 2016-09-28 14:25:41 -04:00
Hypolite Petovan 7de64afc45 Fix abnormal font size for shared posts 
- Use normal font size for shared content
 2016-09-28 14:01:12 -04:00
Hypolite Petovan f64bd451ca [frio] Increase available width for shared content 
- Added a bottom margin to the shared header
- Removed padding and horizontal margins for the shared content
 2016-09-28 13:08:58 -04:00
Hypolite Petovan 01a8671b66 Revert "[frio] Increase center column width" 
This reverts commit 0c383ad9ff.
 2016-09-28 12:58:44 -04:00
Hypolite Petovan 37b4b0205d [frio] Remove shared content horizontal margins 2016-09-28 11:59:54 -04:00
Hypolite Petovan 0c383ad9ff [frio] Increase center column width 
- Added two Bootstrap divisions to the center column
 2016-09-28 11:59:05 -04:00
Tobias Diekershoff 4aa834564a Merge pull request #2802 from annando/xmpp-profile 
New fields for the DFRN protocol (XMPP and Account Type)
 2016-09-27 20:57:56 +02:00
Michael Vogel 2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Tobias Diekershoff 89b5c9276b DE update to the translation 2016-09-24 14:16:58 +02:00
Tobias Diekershoff 076475383b FR update to the strings, THX Hypolite Petovan 2016-09-24 09:35:23 +02:00
Michael Vogel 3f35fed35a Special characters should be escaped 2016-09-23 06:29:02 +00:00
Tobias Diekershoff 529d2fc74b DE update to the translation 2016-09-22 12:37:39 +02:00
Tobias Diekershoff 754dc02753 PT BR update to the strings 2016-09-21 11:44:01 +02:00
Tobias Diekershoff e5c2c66487 Show the worker queue count if the workers are active 2016-09-20 15:45:55 +02:00
Roland Häder 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
Tobias Diekershoff 88285b4cbf The info is not that important 2016-09-14 06:45:05 +02:00
Tobias Diekershoff f85821839b display current state of PHP logging in admin panel logging informations 2016-09-13 22:52:21 +02:00
fabrixxm 3d6e3cbb78 Merge branch 'master' into develop 2016-09-13 17:19:57 +02:00
Tobias Diekershoff 4eec289522 FR update to the strings, THX Damien Goutte-Gattat 2016-09-13 15:41:38 +02:00
Michael Vogel 4d959f2f9d Merge pull request #2771 from rabuzarus/0709-frio-dropItem-fix 
frio: fix dropItem() didn't work for hubzila posts
 2016-09-07 06:53:53 +02:00
rabuzarus d506b0906c frio: fix dropItem() didn't work for hubzila posts 2016-09-07 03:22:02 +02:00
rabuzarus ced8923323 frio: show attachment icons in posts 2016-09-06 16:21:14 +02:00
Michael Vogel 9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
rabuzarus 9653ae98ae frio: resize textareas on typing. 2016-08-23 16:48:13 +02:00
rabuzarus 37ae63e120 fix contact dropping on contact edit page also for other themes 2016-08-17 16:51:04 +02:00
rabuzarus 212aa99f28 frio: fix contact dropping on contact edit page 2016-08-17 14:32:43 +02:00
rabuzarus efdb98de6d frio: fix - add string to template 2016-08-13 18:59:59 +02:00
Tobias Diekershoff dbab4db754 Merge pull request #2727 from rabuzarus/1008-item-highlight 
frio: highlight - test if the item is available in the dom
 2016-08-10 14:49:27 +02:00
rabuzarus 83e95a5841 frio: highlight - test if the item is available in the dom 2016-08-10 14:42:57 +02:00
Tobias Diekershoff 2a79b8c235 Merge pull request #2726 from rabuzarus/1008-item-highlight 
Frio: fix auto jump to the item position in /display
 2016-08-10 14:42:11 +02:00
rabuzarus 5e440e5359 frio: highlight - wait until the whole page is loaded 2016-08-10 14:26:16 +02:00
rabuzarus cf23a81c33 frio: highlight - use offset() instead of postion() 2016-08-10 14:14:58 +02:00
rabuzarus 531cba5ce5 frio: fix - I used the wrong variable 2016-08-10 13:33:49 +02:00
rabuzarus 7e65d84577 frio: fix for display auto position scroll + some cleanup 2016-08-10 13:07:13 +02:00
Tobias Diekershoff 42b7c9cd74 DE translation 2016-08-10 12:31:54 +02:00
rabuzarus 40b0a8e30c frio: Remote is now called Guest 2016-08-09 14:39:18 +02:00
rabuzarus f52a06d013 frio: correct spelling 2016-08-08 22:25:54 +02:00
rabuzarus 4adc758adb frio: add some missing page background 2016-08-08 22:16:32 +02:00
rabuzarus 62b23b0631 frio: background for people search 2016-08-08 21:54:34 +02:00
Michael Vogel fe5e775b00 Merge pull request #2718 from rabuzarus/0808-frio_notifications_css 
frio: unify size of notif-images + background color for unseen notifs
 2016-08-08 21:31:00 +02:00
rabuzarus 6b979e5ad8 frio: fix duplicated ID's in aside section 2016-08-08 17:15:35 +02:00
rabuzarus 27f04100c8 frio: unify size of notif-images + background color for unseen notifs 2016-08-08 14:05:33 +02:00
Michael Vogel 61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure 
notifications restructure
 2016-08-08 07:41:48 +02:00
Tobias Diekershoff 991914d563 vier 2016-08-06 10:54:54 +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
Michael Vogel d698534027 Merge pull request #2707 from tobiasd/20160804-de 
DE translations THX Andreas
 2016-08-04 14:58:24 +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
Tobias Diekershoff c46a7ddd4a DE translations THX Andreas 2016-08-04 12:12:52 +02:00
Tobias Diekershoff 30b93b74db Merge pull request #2706 from rabuzarus/0308-frio_accept_requests_mobile 
frio: add intro action buttons for mobile devices
 2016-08-04 12:08:40 +02:00
rabuzarus e34e1f7c2b frio: add intro action buttons for mobile devices 2016-08-04 11:36:31 +02:00
Michael Vogel 2d63f9deb6 Worker fastlane can now be activated from the admin interface 2016-08-04 08:51:34 +02:00
rabuzarus ae905cbd1b Merge develop into 0308-Notifications-restructure 
Conflicts:
	mod/notifications.php
 2016-08-03 12:53:38 +02:00
Tobias Diekershoff 35bbc3948f DE update to the strings 2016-08-02 12:30:04 +02:00
rabuzarus 6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +02:00
rabuzarus bcee356f66 notifications - add docu & pagination 2016-08-01 23:04:41 +02:00
rabuzarus 7a4be1cead notifications.php: move more code to NotificationsManager 2016-08-01 18:18:11 +02:00
Tobias Diekershoff 75be187216 Merge pull request #2682 from annando/1607-api-generic-xml 
API: XML is now generated without templates
 2016-08-01 07:25:24 +02:00
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
Michael Vogel 313bc5b0d2 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-30 10:02:39 +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
Michael Vogel 287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Tobias Diekershoff 3e8da763ba IS update to the translations THX Sveinn í Felli 2016-07-26 11:18:38 +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
Tobias Diekershoff 0cbc102c93 DE update to the strings 2016-07-21 09:20:21 +02:00
Michael Vogel 0e7ff6b4db Removed (now) unused templates 2016-07-19 08:46:41 +02:00
Michael Vogel 838f976715 Some more improvements to xml.php, code cleanup 2016-07-17 23:59:35 +02:00