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

3810 commits

Author SHA1 Message Date
Robin Appelman
bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve 
Add a single public api for resolving a cloud id to a user and remote and back
 2017-02-09 14:54:32 +01:00
Robin Appelman
f6cd5200a2
clean cloud ids 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-09 13:31:06 +01:00
Lukas Reschke
4a5a3681d9 Merge pull request #3184 from nextcloud/issue-3165 
Prevent migration from ownCloud 11 to Nextcloud 12
 2017-02-09 13:29:08 +01:00
Joas Schilling
ed4633a552 Merge pull request #3408 from nextcloud/nullstorage-free-space 
return unknown free space from nullstorage
 2017-02-09 13:17:54 +01:00
Joas Schilling
ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name 
oc_token should be nc_token
 2017-02-09 10:07:59 +01:00
Morris Jobke
5e408aeb6c
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-08 20:39:34 -06:00
Robin Appelman
ae66cf8d37
add tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:03 +01:00
Morris Jobke
942465c8b1
fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-03 11:52:01 -06:00
Christoph Wurst
5e728d0eda oc_token should be nc_token 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-02 21:56:44 +01:00
Morris Jobke
5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store 
Login credential store
 2017-01-30 19:30:04 -06:00
Morris Jobke
8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml 
Add navigation via info.xml (#26785)
 2017-01-27 11:25:26 -06:00
Joas Schilling
27f8a832e4
Force to specify the name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-27 09:44:11 +01:00
Morris Jobke
98dc58356f Merge pull request #3284 from nextcloud/remove-avatar-fixup 
remote now unneeded AvatarPermissions repair step
 2017-01-26 20:14:24 -06:00
Morris Jobke
e21170bd1a Merge pull request #3246 from nextcloud/fix-sqlite-dependency 
Remove useless dependency on SQLite (non-PDO)
 2017-01-26 15:41:11 -06:00
Robin Appelman
c76fe2b4f5
remote now unneeded AvatarPermissions repair step 
Avatars are now stored in appdata

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-26 19:24:55 +01:00
Morris Jobke
4536ead454
Remove useless dependency on SQLite (non-PDO) 
* we only require the PDO driver
* fixes #481

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-25 22:23:05 -06:00
Morris Jobke
3be746d660 Merge pull request #3208 from nextcloud/issue-3125-bring-user-management-endpoints-in-line 
Error out when subadmin doesn't select any group
 2017-01-25 22:16:25 -06:00
Björn Schießle
ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api 
add data from the users profile to the provisioning api
 2017-01-25 15:44:36 +01:00
Bjoern Schiessle
5086335643
unify endpoints form core and the the provisioning api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-25 11:20:35 +01:00
Morris Jobke
95ab46e3d2 Merge pull request #3030 from nextcloud/filesapi-renamefailcase 
Fix files node API failed rename/copy
 2017-01-24 21:23:59 -06:00
Morris Jobke
e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons 
add icons to navigation of personal & admin settings
 2017-01-24 10:56:31 -06:00
Magnus Walbeck
eadc1ac637 Mimetype detection for hidden files 
Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
 2017-01-23 13:28:35 +01:00
Joas Schilling
18d7701d09
Prevent migration from ownCloud 11 to Nextcloud 12 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-23 12:04:46 +01:00
Joas Schilling
73856ac639
Error out when subadmin doesn't select any group 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-23 11:58:58 +01:00
Joas Schilling
a113f951d6
Adjust the tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-20 12:55:48 +01:00
Joas Schilling
80b800128d
Fix the manager tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-19 11:02:56 +01:00
Bjoern Schiessle
0271ae3b46
add some unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-18 15:25:16 +01:00
Joas Schilling
aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions 
Markdown support for app descriptions
 2017-01-17 11:11:16 +01:00
Christoph Wurst
012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs 
Filter out sensitive appconfig values
 2017-01-17 11:01:42 +01:00
Lukas Reschke
6a047a045a
Apply DOMPurify over HTML 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-13 18:58:18 +01:00
Morris Jobke
4d7dee5996
Fix JSUnit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-13 18:33:43 +01:00
Joas Schilling
fcfb4205bc
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:43 +01:00
Joas Schilling
0f792fedef Merge pull request #3060 from nextcloud/cleanup-js-tests 
Cleanup js tests
 2017-01-13 14:47:06 +01:00
Christoph Wurst
dd88e70dff fix image warnings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:49:37 +01:00
Christoph Wurst
c82befbc00 allow/fix loading of fonts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:46:06 +01:00
Morris Jobke
622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements 
create new encryption keys on password reset and backup the old one
 2017-01-13 11:28:43 +01:00
Vincent Petry
269b652754
Add tests for move/copy hooks in Node API 
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
 2017-01-12 13:52:59 +01:00
Vincent Petry
e667b28298
Fix files node API failed rename/copy 
Whenever a rename or copy operation failed on the view, we must throw
an exception instead of just ignoring.

Signed-off-by: Vincent Petry <pvince81@owncloud.com>
 2017-01-12 13:52:59 +01:00
Joas Schilling
5dc6899d1a
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-12 10:49:22 +01:00
Christoph Wurst
140555b786
always allow remembered login 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
21d3fe5883
do not hard-require the token provider 
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
6f74ecd94a
use login hook credentials as fallback 
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
a6dca9e7a0
add login credential store 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:09 +01:00
Vincent Petry
eb5ea0e260
Refactor files node API for more code reuse 
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
 2017-01-11 14:53:42 +01:00
Christoph Wurst
243c9c0941
fix coding style and increase code coverage 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 11:01:54 +01:00
Cornelius Kölbel
b8d41752ca
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-11 11:01:54 +01:00
Roeland Jago Douma
f515c6db4a Merge pull request #2745 from nextcloud/oc_26590 
[downstream] Skip local shares in bkg scan and occ files:scan (#26590)
 2017-01-11 08:16:12 +01:00
Roeland Jago Douma
a90cbb0f09 Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully 
Handle log_type "nextcloud" more gracefully
 2017-01-11 08:14:24 +01:00
Bjoern Schiessle
fcda3a20f4
create new encryption keys on password reset and backup the old one 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-10 17:04:32 +01:00
Roeland Jago Douma
40239decb1 Merge pull request #3012 from nextcloud/fix-karma-image-warnings 
show fewer warnings in karma test runs
 2017-01-10 16:29:39 +01:00