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 H3
b59ca39d32
Rename view/lang/en-US/strings.php to view/lang/en-us/strings.php
2017-06-06 13:00:20 +07:00
Andy H3
0322ed4dbc
Rename view/lang/en-US/messages.po to view/lang/en-us/messages.po
2017-06-06 12:58:59 +07:00
Andy H3
2529552809
Rename view/lang/en-GB/strings.php to view/lang/en-gb/strings.php
2017-06-06 12:58:20 +07:00
Andy H3
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 H3
379a01a1c5
Update messages.po
2017-06-05 22:22:16 +07:00
Andy H3
098ef3de99
Create strings.php
2017-06-05 22:21:31 +07:00
Andy H3
a7403349bc
Create messages.po
2017-06-05 22:20:27 +07:00
Andy H3
757bf75493
Update strings.php
2017-06-05 21:37:56 +07:00
Andy H3
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 H3
29560a3d06
Update strings.php
2017-05-29 15:36:12 +07:00
Andy H3
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 H3
cebe1c00db
EN-GB Translation
2017-05-23 22:05:34 +07:00
Andy H3
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
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
