Lukas Reschke
d3e7dd1992
Merge pull request #7057 from nextcloud/ldap-sync-split
...
Bring LDAP user attribute updates ("sync") to the background
2017-11-10 15:02:26 +01:00
John Molakvoæ (skjnldsv)
f40e56f0e6
Fix menu declaration and width calculation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-10 08:23:24 +01:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex
2017-11-10 01:09:43 +00:00
John Molakvoæ (skjnldsv)
ebf131be84
Fixed firefox scrollbar
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 18:46:08 +01:00
Georg Ehrke
7784672cc0
add option to filter CalendarAPI by componenttype
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke
dd13aecc88
update dav autoloaders after adding calendar api
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke
f06fc67e8e
update autoloader to included added classes and interface
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke
fa416e031b
integrate Dav app with Calendar API
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke
556b2a2b6f
implement CalendarManager
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:50 +01:00
Robin Appelman
0baa7ce911
Fix "allow user mount" checkbox for external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-09 14:49:21 +01:00
Georg Ehrke
5d206eec69
Public interfaces for calendar API
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 13:00:26 +01:00
Morris Jobke
c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint
...
Theming: add hint about favicon generation
2017-11-09 12:16:55 +01:00
Arthur Schiwon
419759e68b
resolve DI
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon
3ba8b337a4
fix unit tests after rebase
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon
8113f26eed
add Sync test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon
fc6b3902af
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon
59c05d5447
move LDAP user attributes "sync" to background (except for ajax jobs)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:56 +01:00
Julius Härtl
7dc9f6f40c
Merge pull request #6736 from nextcloud/Dennis1993-patch-1
...
Move login page more to the top
2017-11-09 11:10:46 +01:00
Arthur Schiwon
ef3cd32916
don't skip updating when ajax is set as background job mode
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:04 +01:00
Arthur Schiwon
c6f1af9896
move ldap user sync to background (WIP)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:09:59 +01:00
John Molakvoæ (skjnldsv)
2a1e9ad046
Removed console log
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 11:04:30 +01:00
John Molakvoæ (skjnldsv)
521b8e813d
Fixed header menus
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 10:58:51 +01:00
Nextcloud bot
723a25a315
[tx-robot] updated from transifex
2017-11-09 09:12:41 +00:00
Morris Jobke
e6ad00b33d
Merge pull request #7117 from nextcloud/fix-welcome-string
...
Fix welcome text for better grammar in themed instances
2017-11-09 10:03:59 +01:00
Morris Jobke
479966dce8
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:03:31 +01:00
Morris Jobke
5d8421135e
Merge pull request #7014 from nextcloud/rename-locks
...
Unlock files even if an exception occurs while renaming
2017-11-09 09:47:36 +01:00
Morris Jobke
e0aaca1726
Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-selected-file-does-not-match
...
Hide summary file actions when a selected file does not match
2017-11-09 09:45:55 +01:00
Morris Jobke
eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1
...
Rello patch 1
2017-11-09 09:41:01 +01:00
Morris Jobke
6b3975c23a
Merge pull request #6846 from nextcloud/filelist-confict-path
...
still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:33:59 +01:00
Morris Jobke
a0aef6ab1b
Fix welcome text for better grammar in themed instances
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:27:38 +01:00
Lukas Reschke
2bfa1ce5c3
Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
...
Ldap agent credentials save
2017-11-09 09:26:51 +01:00
Nextcloud bot
aa525d89e8
[tx-robot] updated from transifex
2017-11-09 01:09:13 +00:00
Lukas Reschke
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath
...
Allow getting the filepath when getting cached mounts by fileid
2017-11-09 00:04:25 +01:00
Lukas Reschke
f9d8eb2a2e
Merge pull request #7111 from nextcloud/login-button-ios-f
...
Fix login appearance for ios webkit engine
2017-11-09 00:00:07 +01:00
Morris Jobke
e0784c66ed
Merge pull request #7109 from nextcloud/fix_6898
...
If for some reason the json can't be decoded it is not cached
2017-11-08 23:33:02 +01:00
Julius Härtl
b1b8c99193
Theming: add hint about favicon generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 23:31:18 +01:00
Kyle Fazzari
9c24b7be2d
tests: change helper scope
...
This seems to be the only way to have the same helpers used between
tests in a manner that works for both standalone phpunit and
autotest.sh.
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-08 12:44:54 -08:00
John Molakvoæ (skjnldsv)
85355e98e6
Fixed tests and width calculation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 20:12:38 +01:00
John Molakvoæ (skjnldsv)
aea30e0004
Scrutinizer fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:12:56 +01:00
John Molakvoæ (skjnldsv)
584272962a
Improve drag & drop and fix some background issue if d&d on narrow windows
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:03:32 +01:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master
...
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
John Molakvoæ (skjnldsv)
b001060556
Fixed remaining tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:11:33 +01:00
John Molakvoæ (skjnldsv)
f25cb7d156
Menu hidden by default
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:05:01 +01:00
John Molakvoæ (skjnldsv)
694a96d938
Fixed some more test and loop fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 17:54:38 +01:00
Robin Appelman
c566b2854b
Use non empty files for object store touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:51:02 +01:00
Robin Appelman
70a4860ccb
Fix contructing headers for s3 download
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:50:46 +01:00
Lukas Reschke
d948626736
Merge pull request #7110 from nextcloud/fix-flow-redirect
...
Theming: theme flow redirection page
2017-11-08 17:45:38 +01:00
Morris Jobke
5651fdf10c
Merge pull request #7107 from nextcloud/revert-6645
...
Revert "Only allow colons in db host for IPv6 addresses"
2017-11-08 17:06:01 +01:00
John Molakvoæ (skjnldsv)
41210c8cf1
Add droppable ability to menu and icon switch. Fix colour
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:56:58 +01:00
John Molakvoæ (skjnldsv)
267b673ccb
Updated tests according to new system
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:04:10 +01:00