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

3297 commits

Author SHA1 Message Date
Lukas Reschke
21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Christoph Wurst
03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307 
Follow up to #3949 (app exists on enable)
 2017-03-20 18:10:05 +01:00
Roeland Jago Douma
1565177fb5
Revert "Add a magic wrapper to allow phpunit4 to run the code again " 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-20 14:25:43 +01:00
Julius Härtl
a0f7d4b688
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:20:34 +01:00
Julius Härtl
29ec58f1b5
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:12:35 +01:00
Julius Haertl
4fbf9a4feb
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Joas Schilling
85a5c24934 Merge pull request #3939 from nextcloud/downstream-27159 
Fix malformed logging in exception
 2017-03-20 12:46:48 +01:00
Joas Schilling
257fbd85eb Merge pull request #3929 from nextcloud/downstream-27068 
cache loadUser if not exists
 2017-03-20 12:44:54 +01:00
Joas Schilling
35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Lukas Reschke
a3739906f6 Merge pull request #3924 from nextcloud/preview_fixes 
Do not generate the max preview twice
 2017-03-20 11:45:51 +01:00
Joas Schilling
5795482282
createMock 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 11:14:14 +01:00
Lukas Reschke
ab9e3525cc
Move error message to log entry 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 11:06:08 +01:00
Joas Schilling
3eb8313657
Fix the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:45:27 +01:00
Joas Schilling
591e75df5c
Don't use a generic exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:33:16 +01:00
Morris Jobke
c969d8005e Merge pull request #3949 from nextcloud/downstream-27307 
Check if app exists before enabling
 2017-03-20 03:21:02 -06:00
Morris Jobke
50b0a4b181
Improve the test case 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:47:32 -06:00
Vincent Petry
aacfef463c
Add tests for database user backend caching 
Add comment, closeCursor in user DB query

Invalidate user in cache after successful creation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:03:03 -06:00
noveens
5481a9b84a
checking if app exists in the FileStream now 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 00:38:29 -06:00
Jörn Friedrich Dreyer
c96486cfae
test setTagGroups with empty groupids 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:01:46 -06:00
Morris Jobke
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff 
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 15:53:49 -06:00
Morris Jobke
c02527e414 Merge pull request #3927 from nextcloud/minor-fixes 
Namespace and array syntax fixes
 2017-03-19 15:49:38 -06:00
Morris Jobke
d99ce3971b
Namespace and array syntax fixes 
* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 14:52:54 -06:00
Roeland Jago Douma
a1f46db793
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 21:15:54 +01:00
Roeland Jago Douma
ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2 
Support Circles
 2017-03-19 20:45:55 +01:00
Lukas Reschke
3adee0f18b Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url 
Always suggest the overwrite.cli.url
 2017-03-18 00:01:17 +01:00
Maxence Lange
69694012ab shares-circles 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-17 18:48:33 -01:00
Joas Schilling
26eda9dd58 Merge pull request #3892 from nextcloud/downstream-27101 
Redirect unlink to rmdir
 2017-03-17 13:56:36 +01:00
Joas Schilling
80d2717e5c
Fix 5.6 duplicate class import 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:54:58 +01:00
Joas Schilling
75b81c3e01
Always suggest the overwrite.cli.url 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:40:58 +01:00
Joas Schilling
c65848effe Merge pull request #3878 from nextcloud/downstream-26303 
Fixed failing test which was ignoring a required (not null) column
 2017-03-17 11:10:21 +01:00
Joas Schilling
70bd819dd2
Cleanup test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:59:53 +01:00
Joas Schilling
2f16f3ba44
Fix unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:39:08 +01:00
Joas Schilling
ebabf81473
Clean up the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:35:22 +01:00
Joas Schilling
bd97b7d130
Use DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:23:04 +01:00
Philipp Schaffrath
2ccf544ad7
Fixed failing test which was ignoring a required (not null) column (#26303) 
* Fixed failing test which was ignoring a required (not null) column

* restored test to original, catching DriverException which also catches ConstraintViolationException

* catch ConstraintViolationException again

* removed unnecessary field from this test

* clobfield should be nullable

* clobfield now is nullable

* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does

* this field does not auto increment anymore

* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:09:07 -06:00
Vincent Petry
377fdf3860
Skip null groups in group manager (#26871) (#26956) 
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:07:03 -06:00
Vincent Petry
7256940524
Redirect unlink to rmdir (#27101) 
Many API callers will call unlink even for directories and it can mess
up with some wrappers like the encryption wrapper

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-16 23:45:03 -06:00
Lukas Reschke
5f8f29508f
Adjust tests to include base-uri 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-16 18:12:10 +01:00
Lukas Reschke
adfd1e63f6
Add base-uri to CSP policy 
As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-16 15:16:20 +01:00
Morris Jobke
f7cef9f702 Merge pull request #3772 from nextcloud/favorite-search 
Allow searching for favorites
 2017-03-13 00:55:12 -06:00
Lukas Reschke
f74911b638 Merge pull request #3787 from nextcloud/ocs-cookie 
dont require strict same site cookies for ocs requests
 2017-03-10 18:14:38 +01:00
Robin Appelman
9a8cef965f
add test for skipping cookie checks for ocs 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-10 14:11:00 +01:00
Morris Jobke
a5ba1f7803
Remove legacy class OC_Group and OC_User 
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-09 17:35:09 -06:00
Björn Schießle
c23c062c89 Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints 
Announce trusted server endpoints
 2017-03-09 14:39:18 +01:00
Bjoern Schiessle
43bca9f7f6
add and adjust unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-09 10:07:52 +01:00
Robin Appelman
e61606a767
Allow searching for favorites 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-08 16:30:55 +01:00
Robin Appelman
2a8e922d67 Merge pull request #3360 from nextcloud/dav-search 
Implement webdav SEARCH
 2017-03-08 13:09:19 +01:00
Joas Schilling
342ee51dad
Make the test useful 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-03 12:01:38 +01:00
Morris Jobke
0b12eb0640
Execute UpdateLanguageCode only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-02 21:53:36 -06:00
Joas Schilling
ba472f7ce0
Fix table name and add a test for more than 1 entries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 09:11:47 +01:00