wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41450 commits 157 branches 562 tags 714 MiB
Commit graph

41450 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Härtl
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
Julius Härtl
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
John Molakvoæ
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
Morris Jobke
289d6801f4
Fix typo in sample config 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-13 07:41:48 +01:00
Nextcloud bot
f376659933
[tx-robot] updated from transifex 2017-11-13 01:10:11 +00:00
Georg Ehrke
19b77039d7
remove cached size from shared calendar objects 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-12 17:30:22 +01:00
Kyle Fazzari
d2a2793073
JSResourceLocator: re-use $app_path 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-12 08:08:38 -08:00
John Molakvoæ (skjnldsv)
b4f5b38713
Add menu tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-11-12 05:20:06 +01:00
Nextcloud bot
8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
sidey79
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
sidey79
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
sidey79
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
sidey79
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
sidey79
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
sidey79
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
Robin Appelman
56fd462718
Use the correct root for shared jail when the source storage is also a jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-10 17:03:27 +01:00
Marin Treselj
7914d8cf86 third batch of fixed and re-optimized icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-10 16:13:24 +01:00
blizzz
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
Marin Treselj
4d5490c339 second batch of fixed and re-optimized icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-10 15:21:44 +01:00
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