e23921c7b1
Merge pull request #7123 from nextcloud/external-storage-user-mount-checkbox
...
Fix "allow user mount" checkbox for external storage
2017-11-13 14:52:21 +01:00
ff2d4432d8
Merge pull request #7051 from nextcloud/breadcrumbs-refactor
...
Breadcrumbs refactor
2017-11-13 12:19:05 +01:00
26bcf40e9e
Merge pull request #6460 from nextcloud/theming-favicon-generated-sizes
...
Theming: Generate different favicon sizes
2017-11-13 12:15:34 +01:00
ed37dc43bd
Merge pull request #7154 from nextcloud/fix-typo
...
Fix typo in sample config
2017-11-13 11:48:31 +01:00
8c2dbeb13a
Added more tests and only test jsunit on drone (for testing only)
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-13 10:51:31 +01:00
7a812aa0e1
Theming: bump version to retrigger icon generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
d70e9059a5
Theming: Fix tests for favicon containing multiple sizes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
31b9fc9eac
Theming: Generate favicon sizes to avoid resizing issues done by the browser
...
fixes #5193
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-11-13 10:18:47 +01:00
8e61ad8847
Merge pull request #6678 from nextcloud/downstream-ldap-configurable-user-update
...
LDAP: configurable user update interval
2017-11-13 08:14:52 +01:00
289d6801f4
Fix typo in sample config
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-13 07:41:48 +01:00
f376659933
[tx-robot] updated from transifex
2017-11-13 01:10:11 +00:00
b4f5b38713
Add menu tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-12 05:20:06 +01:00
8e3861563b
[tx-robot] updated from transifex
2017-11-12 01:10:00 +00:00
6ca4abfc0b
[tx-robot] updated from transifex
2017-11-11 01:10:09 +00:00
d536e4e3b8
Fixed indentation
...
Fixed indentation of this pr
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
fbd8c5db4f
Fixed typo from last commit
...
Fixed typo in getAppValue mocket method from last commit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
ea0ad82e56
Update testUpdateNoRefresh
...
Mocked getAppValue to deliver a value of 1800 when updateAttributesInterval is requested by needsRefresh.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:15 +01:00
45dfc11137
tryfix needsRefresh unit tests
...
Forced updateAttributesInterval from getAppValue to int
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
039f6c9636
Fixed Typo in user.php
...
Fixed a typo for the app config prameter updateAttributesInterval
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
0b290c0904
Update User.php
...
Makes the time between needsRefresh configurable via app config option updateAttribuesInterval.
Default is still 86400 secons which is one day.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:36 +01:00
1a2f9fe678
Merge pull request #7056 from nextcloud/oc-28415-enable-chunking-in-authenticated-web-upload
...
[oc] Enable chunking for bigger files in authenticated web upload
2017-11-10 15:35:58 +01:00
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
f40e56f0e6
Fix menu declaration and width calculation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-10 08:23:24 +01:00
ede6499de4
[tx-robot] updated from transifex
2017-11-10 01:09:43 +00:00
ebf131be84
Fixed firefox scrollbar
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 18:46:08 +01:00
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
c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint
...
Theming: add hint about favicon generation
2017-11-09 12:16:55 +01:00
419759e68b
resolve DI
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
3ba8b337a4
fix unit tests after rebase
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
8113f26eed
add Sync test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
fc6b3902af
adjust tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
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
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
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
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
2a1e9ad046
Removed console log
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 11:04:30 +01:00
521b8e813d
Fixed header menus
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 10:58:51 +01:00
723a25a315
[tx-robot] updated from transifex
2017-11-09 09:12:41 +00:00
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
479966dce8
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:03:31 +01:00
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
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
eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1
...
Rello patch 1
2017-11-09 09:41:01 +01:00
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
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
2bfa1ce5c3
Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
...
Ldap agent credentials save
2017-11-09 09:26:51 +01:00
aa525d89e8
[tx-robot] updated from transifex
2017-11-09 01:09:13 +00:00
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
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
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
Morris Jobke
Joas Schilling
John Molakvoæ (skjnldsv)
Julius Härtl
John Molakvoæ
Nextcloud bot
sidey79
blizzz
Lukas Reschke
Robin Appelman
Julius Härtl