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

42439 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
48884c9b6a
Merge pull request #8111 from nextcloud/only_encrypted_prop_on_folders 
Only handle encrypted property on folders
 2018-01-30 21:54:18 +01:00
Julius Härtl
f23ed5e0ea
Make sure we don't query the AppManager before the installation started 
Otherwise we end up with the database not being instantiated

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-30 19:05:49 +01:00
Roeland Jago Douma
9896b15ec8
Only handle encrypted property on folders 
Exposing the encrypted property is required for E2E. However, there is
no need to expose this on files as then it is server side encryption
(which the clients don't care about).

Better to not confuse the output.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-30 12:25:49 +01:00
Roeland Jago Douma
9a73a1f063
Merge pull request #8103 from nextcloud/bump_clipboard 
[js] Bump clipboard
 2018-01-30 09:34:55 +01:00
Nextcloud bot
3867717107
[tx-robot] updated from transifex 2018-01-30 01:11:04 +00:00
Roeland Jago Douma
7cbcbab5a6
Update core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 16:58:03 +01:00
Roeland Jago Douma
6bca362ce9
Bump clipboardjs 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 16:57:15 +01:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +01:00
Joas Schilling
d971b104ed
Do not cache the settings/sections in the database anymore 
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-29 15:47:37 +01:00
Morris Jobke
01482b32a1
Merge pull request #8062 from nextcloud/use-class 
Use ::class statement instead of string
 2018-01-29 15:25:08 +01:00
Robin Appelman
84bd2b6bc9
fix invalidating folder cache for s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-29 15:09:15 +01:00
Robin Appelman
7afd77604e
adjust s3 bulk delete to new sdk syntax 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-29 15:06:10 +01:00
Roeland Jago Douma
6d86dcb265
Merge pull request #7873 from nextcloud/fix_5694 
Don't perform CSRF check on OCS routes with Bearer auth
 2018-01-29 15:02:22 +01:00
Roeland Jago Douma
7405dfb544
Update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 14:37:18 +01:00
Roeland Jago Douma
c0adfa4375
Don't perform CSRF check on OCS routes with Bearer auth 
Fixes #5694

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 14:37:18 +01:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Nextcloud bot
1d8b90b8d3
[tx-robot] updated from transifex 2018-01-29 01:10:53 +00:00
Morris Jobke
e43138a658
Merge pull request #8076 from nextcloud/bump_autosize 
[js] Bump autosize
 2018-01-27 13:51:17 +01:00
Roeland Jago Douma
ed59019b0c
Merge pull request #8079 from nextcloud/remove-unneeded-semicolon-and-parentheses 
Remove unneeded semicolon and parentheses
 2018-01-27 11:23:36 +01:00
Nextcloud bot
513f70b1c3
[tx-robot] updated from transifex 2018-01-27 01:10:50 +00:00
Morris Jobke
a661f043e1
Remove unneeded semicolon and parentheses 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 23:46:40 +01:00
Julius Härtl
5dbf733395
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 20:13:28 +01:00
Julius Härtl
e4c58fc473
Add typehinting an fix some minor cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 20:11:37 +01:00
Julius Härtl
5ec7296f6d
Add tests for URL rewriting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:56:13 +01:00
Julius Härtl
6770213649
Do not rewrite absolute URLs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:08:45 +01:00
Julius Härtl
68db09ddce
Clear injectect variables when resetting the cache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:07:30 +01:00
Julius Härtl
60e601f4ab
Only override image styles if the theming values are set 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:05:10 +01:00
Morris Jobke
9be6050cc4
Merge pull request #8072 from nextcloud/type-casting 
Use type casting instead of *val() method
 2018-01-26 17:34:55 +01:00
Julius Härtl
5eae4819bf
Make sure that injected variables do not break the CSS generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 17:03:22 +01:00
Julius Härtl
92e93704be
SCSS files are only cached if their size is > 0 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 17:02:54 +01:00
Roeland Jago Douma
45ca65ec82
Regenerate core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 15:47:19 +01:00
Morris Jobke
97c216ea06
Merge pull request #8071 from nextcloud/remove-silly-code 
Cleanup unused code
 2018-01-26 15:47:06 +01:00
Morris Jobke
c67736a542
Merge pull request #7707 from nextcloud/bugfix/noid/birthdaycalendar-different-uids 
generate different UIDs for Birthday, Anniversary and Death event
 2018-01-26 15:46:46 +01:00
Morris Jobke
08d184816f
Merge pull request #8070 from nextcloud/remove-theming-migration 
Remove theming migration
 2018-01-26 15:46:29 +01:00
Roeland Jago Douma
e908f60315
Bump autosize to 4.0.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 15:44:54 +01:00
Morris Jobke
4c38d1ed01
Merge pull request #8054 from nextcloud/substr-use-index 
Use index based string access for substr with length of 1
 2018-01-26 15:40:44 +01:00
Morris Jobke
c005fc6755
Cleanup unused code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 15:25:19 +01:00
Julius Härtl
5e325730d6
Remove theming migration 
Those images are alredy migrated after the instance has been updated to NC12

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 15:10:22 +01:00
Morris Jobke
2ad2eb38e8
Use type casting instead of *val() method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 15:01:27 +01:00
Morris Jobke
ca493ab5b1
Merge pull request #8069 from nextcloud/no-catch-serverdown 
do not catch and ignore ServerNotAvailable in the wrong spot
 2018-01-26 14:01:07 +01:00
Morris Jobke
9ff51aafc5
Use index based string access for substr with length of 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 13:38:34 +01:00
Morris Jobke
01d362d870
Merge pull request #8068 from nextcloud/simplify-ternary 
Simplify ternary operator statements
 2018-01-26 13:22:06 +01:00
Roeland Jago Douma
119896a8d7
Fix tests 
* Add factory for the federatedfilesharing app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 12:49:11 +01:00
Arthur Schiwon
b61b906abe
do not catch ServerNotAvailable 
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-26 12:47:19 +01:00
Morris Jobke
6bbea33133
Simplify ternary operator statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 12:36:25 +01:00
Morris Jobke
26682b6936
Merge pull request #8061 from nextcloud/use-typecasting 
Use type casting instead of *val() method
 2018-01-26 12:25:50 +01:00
Morris Jobke
c1e4f9f305
Use type casting instead of *val() method 
It should be up to 6x faster

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 11:35:42 +01:00
Roeland Jago Douma
f3723434ee
Don't expose language and password as editable 
* Password might not always be editable
  - Also chaging that will invalide apptokens etc which will directly
  lock out your phone
* Chaging the language also doesn't make that much sense to me currently

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 11:22:20 +01:00
Roeland Jago Douma
70b19761aa
Provide list of editable fields via OCS API 
Fixes #7983

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 11:20:58 +01:00
Morris Jobke
fe7e726ab2
Merge pull request #8064 from nextcloud/background-jobs 
Deprecated OCP interface to fetch background job type
 2018-01-26 10:43:21 +01:00