4aa4e4080c
Include accept / decline links in CalDAV invitation emails
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-29 10:44:44 +02:00
3ff3141a1e
Merge pull request #9705 from nextcloud/feature/9163/whatsnew-admin-gui
...
display whats new info in admin settings
2018-06-29 10:36:04 +02:00
79f16f9d46
Merge pull request #10037 from nextcloud/dav-options-search
...
Fix search related results in OPTIONS requests
2018-06-29 09:36:12 +02:00
11f26be545
Bump version to trigger migration
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 09:11:04 +02:00
000c302505
Update Vue settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 09:11:04 +02:00
241b59f458
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
6044733b2d
fix build step
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
89c3010d14
fix updating the db row due to lacking id col
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
4e073010df
Rebuild
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 09:11:04 +02:00
c7728c9a16
updated production js files
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
25d9c3e529
adjust backend and gui to update and changelog server
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:11:04 +02:00
4ed8ee1c1e
Unify vue template design
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
790c897d98
various fixes, typo, center popover, updated build
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
a9e59ff732
Popover design fixes and settings update
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-29 09:08:33 +02:00
427ac19e91
adjust and reuse apps.css, makes additional class and rules unnecessary
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
3fa5e46019
CSS fixes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
dfc56e4f03
do things with npm so make build-js-production succeeds without complaints
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
7ad0a43cc1
fix method declaration
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
1e0761c6b8
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
bafb6b3c29
display whats new info in admin settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-29 09:08:33 +02:00
61842f66ee
Merge pull request #5623 from nextcloud/locale-setting
...
Add user locale/region setting
2018-06-29 08:03:43 +02:00
c1682f4228
Update PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-29 08:02:50 +02:00
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
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
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
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
Georg Ehrke
Morris Jobke
Roeland Jago Douma
Arthur Schiwon
John Molakvoæ (skjnldsv)
Nextcloud bot
Julius Härtl
Roeland Jago Douma
Daniel Calviño Sánchez
Robin Appelman