b7fb43484e
Merge pull request #3614 from annando/avoid-warnings
...
Avoid some PHP warnings, no functional changes
2017-08-03 07:58:16 +02:00
1bd85971a4
Avoid some PHP warnings, no functional changes
2017-08-03 05:50:44 +00:00
rabuzarus
ccb3f6b655
Add subthread to frio (needs reanabling the frio theme)
2017-08-02 15:52:11 +02:00
016e4a0efc
Show contacts personal message in local profile
2017-08-01 17:47:13 +02:00
fc3bb1ec70
Update US and GB Translations
2017-07-31 21:18:22 +07:00
c98ae304c0
Endless scroll now avoids showing the same items
2017-07-31 06:04:37 +00:00
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
d88584af69
Merge pull request #3567 from rjm6823/develop
...
Contacts page directory link
2017-07-08 08:36:54 +02:00
d535864d98
added template for delete item
2017-07-07 10:37:36 +02:00
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
e515c20cbc
DE translations
2017-06-30 08:24:45 +02:00
0f604538ba
EN-GB and EN-US Translations
2017-06-26 18:03:32 +07:00
afa7421aa2
DE Translation
2017-06-26 17:43:00 +07:00
bee466532f
DE Translation
2017-06-26 17:31:12 +07:00
6672dcc36f
DE translations
2017-06-26 11:07:18 +02:00
e0c46678e5
autofocus for search input field
2017-06-24 10:17:16 +02:00
45ef0a9ee0
DE translations
2017-06-19 17:03:08 +02:00
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
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
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
6e6941a546
We have an alternate link
2017-06-06 21:56:25 +00:00
932e14971f
Issue 2864: Add a "alternate" link on display page
2017-06-06 17:56:22 +00:00
f3d8da7d33
Merge branch 'master' into develop
2017-06-06 12:20:55 +02:00
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
b59ca39d32
Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php
2017-06-06 13:00:20 +07:00
0322ed4dbc
Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po
2017-06-06 12:58:59 +07:00
2529552809
Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php
2017-06-06 12:58:20 +07:00
a0b0e38c28
Rename view/lang/en-GB/messages.po to view/lang/en-gb/messages.po
2017-06-06 12:57:08 +07:00
cdc0eab49d
ES translation THX Albert
2017-06-06 07:11:27 +02:00
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
379a01a1c5
Update messages.po
2017-06-05 22:22:16 +07:00
098ef3de99
Create strings.php
2017-06-05 22:21:31 +07:00
a7403349bc
Create messages.po
2017-06-05 22:20:27 +07:00
757bf75493
Update strings.php
2017-06-05 21:37:56 +07:00
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
47bd3243cd
Merge pull request #3500 from AndyHee/3.5.2rc
...
Update EN-GB translation core
2017-05-29 11:18:42 +02:00
29560a3d06
Update strings.php
2017-05-29 15:36:12 +07:00
3e68feb315
Update messages.po
2017-05-29 15:35:04 +07:00
67ae517406
DE translations
2017-05-29 07:21:42 +02:00
c74f144f15
RU translations THX Frederico Gonçalves Guimarães
2017-05-27 09:35:23 +02:00
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
cebe1c00db
EN-GB Translation
2017-05-23 22:05:34 +07:00
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
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
3fb99e74d8
IT translations THX fabrixxm
2017-05-16 07:39:38 +02:00
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
dacef3683a
add token to register
2017-05-06 14:49:53 +02:00
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
2c0e76f2cc
DE translations
2017-05-01 08:23:01 +02:00
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
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
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
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
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
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
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
a0a0885527
Merge pull request #3339 from Hypolite/issue/#2803-icons
...
Change icon of contact page links
2017-04-14 07:35:16 +02:00
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
d82684219a
Issue 3331: Removed unneeded table "deliverq"
2017-04-13 04:51:16 +00:00
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
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
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
f6d7ee2781
Issue 3142: mcrypt is no more (as well as phpseclib)
2017-04-01 08:28:42 +00:00
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
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
