summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move getAppInfo and getAppVersion to IAppManagerJulius Härtl2018-01-314-52/+72
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #8096 from ↵Roeland Jago Douma2018-01-3114-928/+245
|\ | | | | | | | | nextcloud/feature/6382/do-not-cache-settings-in-db-anymore Do not cache the settings/sections in the database anymore
| * Do not cache the settings/sections in the database anymoreJoas Schilling2018-01-2914-928/+245
| | | | | | | | | | | | | | 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>
* | [tx-robot] updated from transifexNextcloud bot2018-01-314-2/+4
| |
* | Merge pull request #8000 from nextcloud/fix_7983Morris Jobke2018-01-306-4/+142
|\ \ | | | | | | Provide list of editable fields via OCS API
| * | Fix testsRoeland Jago Douma2018-01-266-7/+117
| | | | | | | | | | | | | | | | | | * Add factory for the federatedfilesharing app Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Don't expose language and password as editableRoeland Jago Douma2018-01-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | Provide list of editable fields via OCS APIRoeland Jago Douma2018-01-262-0/+33
| | | | | | | | | | | | | | | | | | Fixes #7983 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8114 from nextcloud/settings-initalization-fixRoeland Jago Douma2018-01-301-2/+5
|\ \ \ | | | | | | | | Only initialize settings application if the instance is installed
| * | | Make sure we don't query the AppManager before the installation startedJulius Härtl2018-01-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we end up with the database not being instantiated Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #8111 from nextcloud/only_encrypted_prop_on_foldersRoeland Jago Douma2018-01-301-4/+4
|\ \ \ \ | |/ / / |/| | | Only handle encrypted property on folders
| * | | Only handle encrypted property on foldersRoeland Jago Douma2018-01-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #8103 from nextcloud/bump_clipboardRoeland Jago Douma2018-01-304-10/+10
|\ \ \ \ | | | | | | | | | | [js] Bump clipboard
| * | | | Update core.jsRoeland Jago Douma2018-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump clipboardjsRoeland Jago Douma2018-01-293-8/+8
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / [tx-robot] updated from transifexNextcloud bot2018-01-304-2/+12
|/ / /
* | | Merge pull request #8078 from nextcloud/theming-validate-scssMorris Jobke2018-01-295-38/+69
|\ \ \ | |_|/ |/| | SCSS hardening
| * | Fix theming testsJulius Härtl2018-01-261-8/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add typehinting an fix some minor cleanupJulius Härtl2018-01-261-16/+24
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add tests for URL rewritingJulius Härtl2018-01-261-4/+14
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Do not rewrite absolute URLsJulius Härtl2018-01-262-3/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Clear injectect variables when resetting the cacheJulius Härtl2018-01-261-0/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Only override image styles if the theming values are setJulius Härtl2018-01-261-8/+10
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Make sure that injected variables do not break the CSS generationJulius Härtl2018-01-261-0/+15
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | SCSS files are only cached if their size is > 0Julius Härtl2018-01-261-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #8062 from nextcloud/use-classMorris Jobke2018-01-2953-184/+270
|\ \ \ | | | | | | | | Use ::class statement instead of string
| * | | Use ::class statement instead of stringMorris Jobke2018-01-2953-184/+270
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7873 from nextcloud/fix_5694Roeland Jago Douma2018-01-292-10/+28
|\ \ \ \ | |/ / / |/| | | Don't perform CSRF check on OCS routes with Bearer auth
| * | | Update testsRoeland Jago Douma2018-01-291-8/+20
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Don't perform CSRF check on OCS routes with Bearer authRoeland Jago Douma2018-01-291-2/+8
|/ / / | | | | | | | | | | | | | | | Fixes #5694 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-2918-172/+182
| | |
* | | Merge pull request #8076 from nextcloud/bump_autosizeMorris Jobke2018-01-274-10/+10
|\ \ \ | | | | | | | | [js] Bump autosize
| * | | Regenerate core.jsRoeland Jago Douma2018-01-261-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump autosize to 4.0.0Roeland Jago Douma2018-01-263-8/+8
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8079 from ↵Roeland Jago Douma2018-01-2779-101/+101
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/remove-unneeded-semicolon-and-parentheses Remove unneeded semicolon and parentheses
| * | | Remove unneeded semicolon and parenthesesMorris Jobke2018-01-2679-101/+101
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-2710-0/+14
|/ / /
* | | Merge pull request #8072 from nextcloud/type-castingMorris Jobke2018-01-266-35/+35
|\ \ \ | | | | | | | | Use type casting instead of *val() method
| * | | Use type casting instead of *val() methodMorris Jobke2018-01-266-35/+35
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8071 from nextcloud/remove-silly-codeMorris Jobke2018-01-263-6/+2
|\ \ \ | | | | | | | | Cleanup unused code
| * | | Cleanup unused codeMorris Jobke2018-01-263-6/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7707 from ↵Morris Jobke2018-01-262-4/+5
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/birthdaycalendar-different-uids generate different UIDs for Birthday, Anniversary and Death event
| * | | generate different UIDs for Birthday, Anniversary and Death eventGeorg Ehrke2018-01-042-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #8070 from nextcloud/remove-theming-migrationMorris Jobke2018-01-263-222/+0
|\ \ \ \ | | | | | | | | | | Remove theming migration
| * | | | Remove theming migrationJulius Härtl2018-01-263-222/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | Those images are alredy migrated after the instance has been updated to NC12 Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #8054 from nextcloud/substr-use-indexMorris Jobke2018-01-2612-46/+24
|\ \ \ \ | |/ / / |/| | | Use index based string access for substr with length of 1
| * | | Use index based string access for substr with length of 1Morris Jobke2018-01-2612-46/+24
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8069 from nextcloud/no-catch-serverdownMorris Jobke2018-01-262-2/+8
|\ \ \ \ | | | | | | | | | | do not catch and ignore ServerNotAvailable in the wrong spot
| * | | | do not catch ServerNotAvailableArthur Schiwon2018-01-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | might cause the user to be unavailable (race condition). Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #8068 from nextcloud/simplify-ternaryMorris Jobke2018-01-2613-23/+19
|\ \ \ \ \ | |/ / / / |/| | | | Simplify ternary operator statements
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 21:29:06 +0000