89b6ee1a45
Merge pull request #9773 from nextcloud/feature/noid/resource_booking
...
resource booking
2018-06-29 06:51:49 +02:00
e6780c4fc7
Merge pull request #10043 from nextcloud/bugfix/noid/mergejs-css-vars
...
Run mergejs to add css-vars-ponyfill
2018-06-29 06:51:16 +02:00
ab1b848268
[tx-robot] updated from transifex
2018-06-29 00:12:08 +00:00
28e64afb8c
Merge pull request #10034 from nextcloud/fix/noid/ldap-silence-quota-logmsgs
...
lower log level for quota manipulation cases
2018-06-28 23:06:23 +02:00
68e41a3aae
trashbin:cleanup exceptions for invalid options
...
* throw on no parameters provided
* throw on --all-users and userid provided
Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 22:31:27 +02:00
c04060243a
Run mergejs to add css-vars-ponyfill
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-28 22:16:32 +02:00
cc51a00c93
lower log level for quota manipulation cases
...
and simplify the forest of ifs a little bit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-28 21:10:07 +02:00
9ad0e61df6
Merge pull request #10040 from nextcloud/fix-filenames-in-sharing-integration-tests
...
Fix filenames in sharing integration tests
2018-06-28 19:32:24 +02:00
dd880d1319
Merge pull request #10042 from nextcloud/fix-variable-not-replaced-in-behat-yml-when-default-value-was-used
...
Fix variable not replaced in "behat.yml" when default value was used
2018-06-28 19:31:19 +02:00
4c1e581f47
docblock version fixes
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 17:37:16 +02:00
ea6b5063b5
Fix variable not replaced in "behat.yml" when default value was used
...
As "selenium.server" is a simulated variable it is not recognized by
Mink, so it must be always replaced by its value in "behat.yml" before
the file is parsed by Behat.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-28 17:32:38 +02:00
325403ac24
Design fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-28 17:28:27 +02:00
111c6ceef9
Merge pull request #10039 from nextcloud/ci/noid/disable-codecov-status-and-comment
...
Disable codecov status and comment
2018-06-28 17:17:25 +02:00
6bc3d3781d
Default behaviour when no users are specified on trashbin:cleanup
...
* Add option --all-users to explicitly clean all trashbins
* Reject no users on commandline and no --all-users
* Warn when --all-users and userids are specified
Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 17:14:45 +02:00
b506ec1c89
Check all paths for own files and shares
...
Add "PARENT (2)" and its subdirectories to the paths to be checked, as
before only the own "PARENT" folder was being checked, but not the
shared one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-28 16:45:42 +02:00
e1c28c403d
Fix filenames in sharing integration tests
...
When a file is shared and the receiver of the share already has a file
with the same name that file is left untouched, and "(2)" is appended to
the name of the shared file.
As "textfile0.txt" is included in the user folder skeleton all the users
in the integration test have that file, so when it is shared the
receiver sees the share as "/textfile0 (2).txt", and her own file as
"/textfile0.txt".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-28 16:36:19 +02:00
096c92cbee
Disable codecov status and comment
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-28 16:34:16 +02:00
b9e685236f
Add option to only scan the home storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-28 16:09:25 +02:00
b21bec5c73
Fix search related results in OPTIONS requests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-28 14:54:46 +02:00
388ea2234f
Merge pull request #10036 from nextcloud/feature/9221/show-path-in-log
...
Log path of file that failed to be parsed
2018-06-28 11:36:24 +02:00
d4692d1fbe
Log path of file that failed to be parsed
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-28 11:09:50 +02:00
ab43251a45
Call Backgroundjob with parameter, as interface requires
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-28 10:55:47 +02:00
a077c129c8
Merge pull request #10031 from nextcloud/fix/9987/ldap-backupserver-connect
...
LDAP backup server should not be queried when auth fails
2018-06-28 08:38:52 +02:00
1bf486d93f
[tx-robot] updated from transifex
2018-06-28 00:12:20 +00:00
7a728f2154
LDAP backup server should not be queried when auth fails
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:12:07 +02:00
8c73b13ac8
move locales file to /resources/
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
b17d256761
fix use of findLocale
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
9157086c23
properly handle force_locale setting
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
b3921c65a6
cache available locales to minimize fs access
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:19 +02:00
51a35c23f6
fix camelCase for localesForLanguage
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:18 +02:00
3ffeb4ae06
fix tests / mistakes made during rebase
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:04 +02:00
ad2ef3a81f
Merge pull request #10020 from nextcloud/bugfix/spreed-1007/email-address-misparsed-in-comments-and-chat
...
Fix "parsing" of email-addresses in comments and chat messages
2018-06-27 20:40:47 +02:00
0872f0b4b2
Merge pull request #10018 from nextcloud/rakekniven-patch-2
...
Update root.vue
2018-06-27 20:22:31 +02:00
aa99be29ba
Merge pull request #10027 from nextcloud/feature/noid/settings-groupware
...
Add groupware settings section
2018-06-27 20:04:02 +02:00
f3949cf1a8
Add groupware settings section
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-27 19:16:21 +02:00
9b2d855d19
Merge pull request #10023 from nextcloud/bugfix/noid/class-name-already-in-use
...
Use the correct Base class
2018-06-27 17:21:37 +02:00
826ea8c3f9
Use the correct Base class
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-27 14:17:00 +02:00
314ad266d5
Compile app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-27 13:47:31 +02:00
0cacdd3132
show locale example and apply new locale right away
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:50 +02:00
fd41192bb4
fix OC.getLocale()
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:49 +02:00
9af82296c7
fix position of locale input
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:48 +02:00
bf6bfad76b
OC.getLocale() now returns Locale and no longer Language
...
Added OC.getLanguage() to get Language
<html lang=''> still gets language, though according to IETF BCP47 locale should be good.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:40 +02:00
7d8124ad66
add findLocale() to public interface
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:23 +02:00
abab7eb7f0
handle config.php values
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:23 +02:00
4a9f8623b5
Fix review & tests
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:21 +02:00
93011579fe
Add tests
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:17:43 +02:00
ea380b2918
Allow apps to specify locale for localisation
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:17:26 +02:00
d8921ccd85
Allow user to choose locale
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:15:19 +02:00
e1936a49e7
Fix "parsing" of email-addresses in comments and chat messages
...
\\b matches any non-word character, including \@ and \-
In order to not detect urls in the middle of email-addresses,
we need to check for white space characters and beginning of the
message instead.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-06-27 13:04:05 +02:00
221f558f66
Merge pull request #10016 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.12.2
...
Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibility
2018-06-27 12:47:53 +02:00
Morris Jobke
Nextcloud bot
blizzz
Liam Dennehy
Julius Härtl
Roeland Jago Douma
Georg Ehrke
Daniel Calviño Sánchez
John Molakvoæ (skjnldsv)
Robin Appelman
Joas Schilling
Thomas Citharel