mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
42,271 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

42271 Commits

Author SHA1 Message Date
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
Morris Jobke 4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +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
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
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
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
Morris Jobke 9ef6148bfa
Deprecated OCP interface to fetch background job type 
* was not used by apps and also is not needed
* migrated the documentation to IJobList

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 10:43:01 +01:00
Joas Schilling a7ad7cb08e
Merge pull request #8053 from nextcloud/simplify-substr 
Use short for of substr to not need strlen()
 2018-01-26 10:25:09 +01:00
Joas Schilling c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Roeland Jago Douma fab951e4b3
Merge pull request #8057 from nextcloud/unneeded-implements 
Implements are not needed because they are already done by base class
 2018-01-26 10:00:25 +01:00
Roeland Jago Douma e97165e0b5
Merge pull request #8055 from nextcloud/improve-loop 
Improve conditional of loop
 2018-01-26 09:59:45 +01:00
Roeland Jago Douma ec1d94c629
Merge pull request #8052 from nextcloud/fix-array-methods 
Fix array method usages with a proper call
 2018-01-26 09:53:13 +01:00
Roeland Jago Douma 5a7a5e5352
Merge pull request #8058 from nextcloud/useless-return 
Remove useless return statements
 2018-01-26 09:51:26 +01:00
Roeland Jago Douma 68f44a9a93
Merge pull request #8059 from nextcloud/use-stripos 
Use stripos instead of strpos(strtolower(), 'something')
 2018-01-26 09:50:31 +01:00
Roeland Jago Douma 43ed8b446c
Merge pull request #8060 from nextcloud/proper-codeflow 
Use proper code flow instead of not needed else branch
 2018-01-26 09:49:30 +01:00
Roeland Jago Douma aebb443ca5
Merge pull request #8056 from nextcloud/array-push 
Use $var[] = $a instead of array_push - 2x faster
 2018-01-26 09:41:31 +01:00
Nextcloud bot 469b3724b5
[tx-robot] updated from transifex 2018-01-26 01:10:52 +00:00
Morris Jobke 0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00