Commit Graph

43068 Commits

Author SHA1 Message Date
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
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
Morris Jobke 16a558871c
Use proper code flow instead of not needed else branch
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 23:01:03 +01:00
Morris Jobke 464f024fa9
Use stripos instead of strpos(strtolower(), 'something')
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:59:50 +01:00
Morris Jobke 4dbee99b7b
Remove useless return statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:50:40 +01:00
Morris Jobke 55ef34b23b
Implements are not needed because they are already done by base class
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:42:24 +01:00
Morris Jobke 870fe20acc
Use $var[] = $a instead of array_push - 2x faster
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:36:03 +01:00
Morris Jobke c314eb74a9
Improve conditional of loop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:33:43 +01:00
Morris Jobke e6efa755c9
Use short for of substr to not need strlen()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:23:48 +01:00
Morris Jobke 7800a9bc24
Fix array method usages with a proper call
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:20:10 +01:00
Morris Jobke b9bbb894f8
Merge pull request #7916 from nextcloud/2fa_log
Add 2FA to logfile
2018-01-25 15:57:32 +01:00
Roeland Jago Douma 8160d0bc2a
Merge pull request #8036 from nextcloud/phpunit6
Require PHPUnit 6.5 or higher
2018-01-25 14:50:46 +01:00
Roeland Jago Douma 9e76577ead
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-25 13:44:47 +01:00
Morris Jobke 4718d2b80d
Update memcached image
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 13:40:57 +01:00
Roeland Jago Douma a5fe6a6118
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-25 13:25:09 +01:00