summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use ::class statement instead of stringMorris Jobke2018-01-2953-184/+270
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [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
| * | | Simplify ternary operator statementsMorris Jobke2018-01-2613-23/+19
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8061 from nextcloud/use-typecastingMorris Jobke2018-01-2630-62/+62
|\ \ \ | | | | | | | | Use type casting instead of *val() method
| * | | Use type casting instead of *val() methodMorris Jobke2018-01-2630-62/+62
|/ / / | | | | | | | | | | | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8064 from nextcloud/background-jobsMorris Jobke2018-01-264-46/+27
|\ \ \ | | | | | | | | Deprecated OCP interface to fetch background job type
| * | | Deprecated OCP interface to fetch background job typeMorris Jobke2018-01-264-46/+27
| |/ / | | | | | | | | | | | | | | | | | | * was not used by apps and also is not needed * migrated the documentation to IJobList Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8053 from nextcloud/simplify-substrJoas Schilling2018-01-264-4/+4
|\ \ \ | | | | | | | | Use short for of substr to not need strlen()
| * | | Use short for of substr to not need strlen()Morris Jobke2018-01-254-4/+4
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8063 from nextcloud/inline-valueJoas Schilling2018-01-2619-47/+21
|\ \ \ | | | | | | | | Return value immediately instead of assigning to a one-time variable
| * | | Return value immediately instead of assigning to a one-time variableMorris Jobke2018-01-2619-47/+21
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8057 from nextcloud/unneeded-implementsRoeland Jago Douma2018-01-263-3/+3
|\ \ \ | | | | | | | | Implements are not needed because they are already done by base class
| * | | Implements are not needed because they are already done by base classMorris Jobke2018-01-253-3/+3
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8055 from nextcloud/improve-loopRoeland Jago Douma2018-01-261-1/+2
|\ \ \ | | | | | | | | Improve conditional of loop
| * | | Improve conditional of loopMorris Jobke2018-01-251-1/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8052 from nextcloud/fix-array-methodsRoeland Jago Douma2018-01-263-3/+3
|\ \ \ | | | | | | | | Fix array method usages with a proper call
| * | | Fix array method usages with a proper callMorris Jobke2018-01-253-3/+3
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8058 from nextcloud/useless-returnRoeland Jago Douma2018-01-265-17/+0
|\ \ \ | | | | | | | | Remove useless return statements
| * | | Remove useless return statementsMorris Jobke2018-01-255-17/+0
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8059 from nextcloud/use-striposRoeland Jago Douma2018-01-262-2/+2
|\ \ \ | | | | | | | | Use stripos instead of strpos(strtolower(), 'something')
| * | | Use stripos instead of strpos(strtolower(), 'something')Morris Jobke2018-01-252-2/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8060 from nextcloud/proper-codeflowRoeland Jago Douma2018-01-263-14/+12
|\ \ \ | | | | | | | | Use proper code flow instead of not needed else branch
| * | | Use proper code flow instead of not needed else branchMorris Jobke2018-01-253-14/+12
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8056 from nextcloud/array-pushRoeland Jago Douma2018-01-267-10/+10
|\ \ \ | | | | | | | | Use $var[] = $a instead of array_push - 2x faster
| * | | Use $var[] = $a instead of array_push - 2x fasterMorris Jobke2018-01-257-10/+10
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2018-01-2612-4/+58
|/ /
* | Merge pull request #7916 from nextcloud/2fa_logMorris Jobke2018-01-2511-18/+219
|\ \ | | | | | | Add 2FA to logfile
| * | Add testsRoeland Jago Douma2018-01-254-2/+79
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update autoloaderRoeland Jago Douma2018-01-252-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix testsRoeland Jago Douma2018-01-251-4/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Make admin_audit listen to 2fa eventsRoeland Jago Douma2018-01-252-0/+91
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>