aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-01-2912-80/+88
|
* Remove unneeded semicolon and parenthesesMorris Jobke2018-01-2638-48/+48
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #8072 from nextcloud/type-castingMorris Jobke2018-01-265-34/+34
|\ | | | | Use type casting instead of *val() method
| * Use type casting instead of *val() methodMorris Jobke2018-01-265-34/+34
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8071 from nextcloud/remove-silly-codeMorris Jobke2018-01-262-4/+1
|\ \ | | | | | | Cleanup unused code
| * | Cleanup unused codeMorris Jobke2018-01-262-4/+1
| |/ | | | | | | 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-263-18/+6
|\ \ \ | |/ / |/| | Use index based string access for substr with length of 1
| * | Use index based string access for substr with length of 1Morris Jobke2018-01-263-18/+6
| | | | | | | | | | | | 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>
* | | | Simplify ternary operator statementsMorris Jobke2018-01-263-5/+3
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Use type casting instead of *val() methodMorris Jobke2018-01-2621-41/+41
| | | | | | | | | | | | | | | | | | It should be up to 6x faster Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8053 from nextcloud/simplify-substrJoas Schilling2018-01-261-1/+1
|\ \ \ | | | | | | | | Use short for of substr to not need strlen()
| * | | Use short for of substr to not need strlen()Morris Jobke2018-01-251-1/+1
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8063 from nextcloud/inline-valueJoas Schilling2018-01-2611-24/+11
|\ \ \ | | | | | | | | Return value immediately instead of assigning to a one-time variable
| * | | Return value immediately instead of assigning to a one-time variableMorris Jobke2018-01-2611-24/+11
| |/ / | | | | | | | | | 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-263-8/+0
|\ \ \ | | | | | | | | Remove useless return statements
| * | | Remove useless return statementsMorris Jobke2018-01-253-8/+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-261-1/+0
|\ \ \ | | | | | | | | Use proper code flow instead of not needed else branch
| * | | Use proper code flow instead of not needed else branchMorris Jobke2018-01-251-1/+0
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8056 from nextcloud/array-pushRoeland Jago Douma2018-01-262-2/+2
|\ \ \ | | | | | | | | Use $var[] = $a instead of array_push - 2x faster
| * | | Use $var[] = $a instead of array_push - 2x fasterMorris Jobke2018-01-252-2/+2
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2018-01-266-4/+34
|/ /
* | Merge pull request #7916 from nextcloud/2fa_logMorris Jobke2018-01-255-0/+168
|\ \ | | | | | | Add 2FA to logfile
| * | Add testsRoeland Jago Douma2018-01-252-2/+77
| | | | | | | | | | | | 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>
| * | Make admin_audit listen to 2fa eventsRoeland Jago Douma2018-01-252-0/+91
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8036 from nextcloud/phpunit6Roeland Jago Douma2018-01-2529-60/+67
|\ \ \ | |/ / |/| | Require PHPUnit 6.5 or higher
| * | Class "ProgressBar" is declared "final" and cannot be mocked.Joas Schilling2018-01-251-2/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix risky tests without assertionsJoas Schilling2018-01-2521-37/+48
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix "Undefined method setExpectedException()"Joas Schilling2018-01-246-16/+13
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Require PHPUnit 6.5 or higherJoas Schilling2018-01-242-5/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Fix missing clipboard icon in shared linksDaniel Calviño Sánchez2018-01-241-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | The clipboard icon in shared links appears either directly on the link input field or, if any social sharing app is enabled, in a menu. The clipboard icon uses the same CSS rules as other icons (like the information icon) to be posioned on the end of the input field, and those rules have to be "cancelled" when the icon is shown in the menu. Fixes #7990 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Make filelist and sidebar use the fileid preview endpointRoeland Jago Douma2018-01-242-1/+13
| | | | | | | | | | | | This makes sure the preview is cached even after rename! yay! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7918 from nextcloud/properly-log-exceptionsRoeland Jago Douma2018-01-2318-83/+164
|\ \ | | | | | | Properly log the full exception instead of only the message
| * | Properly log the full exception instead of only the messageMorris Jobke2018-01-2318-83/+164
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-234-0/+8
| | |
* | | Merge pull request #7354 from nextcloud/refacor-update-page-printblizzz2018-01-221-1/+2
|\ \ \ | | | | | | | | Refactor method to check if update is needed
| * | | Refactor method to check if update is neededMorris Jobke2017-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | There was only one call, that actually needed the parameter to be set to true. So this change moved the print of the page to that location and replaces all other occurences with a direct call to the underlying OCP API. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7985 from nextcloud/remove-public-videoRoeland Jago Douma2018-01-222-13/+2
|\ \ \ \ | | | | | | | | | | Remove video preview from files_sharing
| * | | | Remove video preview from files_sharingJulius Härtl2018-01-222-13/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #7994 from nextcloud/smb-notify-test-timeoutRoeland Jago Douma2018-01-221-2/+2
|\ \ \ \ | |/ / / |/| | | increase the time we wait for smb notifications in the test