aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-3130-282/+296
|
* Merge pull request #5116 from McNetic/zipstreamerJoas Schilling2017-05-301-1/+1
|\ | | | | Always enable Zip64 extension for zipstreamer
| * Always enable Zip64 extension for zipstreamerNicolai Ehemann2017-05-251-1/+1
| | | | | | | | Signed-off-by: Nicolai Ehemann <en@enlightened.de>
* | Merge pull request #5135 from patschi/remove-appmenu-limitJoas Schilling2017-05-301-5/+0
|\ \ | | | | | | Remove appmenu limit
| * | Closed #5121, remove appmenu limitPatrik Kernstock2017-05-261-5/+0
| | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-3046-154/+724
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-2938-142/+1032
| | |
* | | Merge pull request #5126 from ↵Lukas Reschke2017-05-281-0/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/setting-the-same-email-shouldnt-trigger-activity Don't trigger activity when the email didn't change
| * | | Don't trigger activity when the email didn't changeJoas Schilling2017-05-261-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-2812-12/+14
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-2720-18/+44
| | | |
* | | | Merge pull request #5095 from patschi/patch-1Björn Schießle2017-05-261-1/+1
|\ \ \ \ | | | | | | | | | | Fix #5059 by adding sanity checks before using var
| * | | | Fix #5059 by adding sanity checks before using varPatrik Kernstock2017-05-241-1/+1
| | |/ / | |/| | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | | Merge pull request #5090 from ↵blizzz2017-05-261-2/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/try-fixing-missing-background-jobs-on-app-update Register the autoloading earlier so we can load the background jobs
| * | | Register the autoloading earlier so we can load the background jobsJoas Schilling2017-05-241-2/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | / [tx-robot] updated from transifexNextcloud bot2017-05-2654-4/+692
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-05-2576-246/+2436
|/
* [tx-robot] updated from transifexNextcloud bot2017-05-2444-18/+150
|
* Merge pull request #5004 from ↵Roeland Jago Douma2017-05-232-2/+2
|\ | | | | | | | | nextcloud/bugfix/fix_replacing_4mbunicode_for_calendar_properties_table fix replacing of 4MB Unicode Chars in cal props table
| * fix replacing of 4MB Unicode Chars in cal props tableGeorg Ehrke2017-05-212-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #5042 from nextcloud/external-get-for-group-sql-typeRoeland Jago Douma2017-05-231-1/+1
|\ \ | | | | | | use the correct param type when getting external storages for groups
| * | use the correct param type when getting external storages for groupsRobin Appelman2017-05-221-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4969 from ↵Roeland Jago Douma2017-05-231-0/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-broken-activity-avatars-with-external-users Fix username and avatar for external users
| * | | Fix username and avatar for external usersJoas Schilling2017-05-191-0/+26
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-23104-120/+204
| |/ / |/| |
* | | Merge pull request #5010 from ↵Joas Schilling2017-05-221-6/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app Fix starting lower case letter in tooltip of Theming app
| * | | Fix starting lower case letter in tooltip of Theming appDaniel Calviño Sánchez2017-05-201-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #5014 from nextcloud/update-opcache-recommendationRoeland Jago Douma2017-05-222-2/+2
|\ \ \ \ | | | | | | | | | | Update Opcache recommendation
| * | | | Update Opcache recommendationMorris Jobke2017-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5016 from nextcloud/reset-opcache-on-updater-page-loadRoeland Jago Douma2017-05-221-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Reset opcache if update is detected
| * | | | | Reset opcache if update is detectedMorris Jobke2017-05-211-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This even works if opcache_reset is in the disabled_functions php.ini setting. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #5023 from nextcloud/version_bumpJoas Schilling2017-05-2223-56/+68
|\ \ \ \ \ | | | | | | | | | | | | We are working on 13 now!
| * | | | | Split multi-author entriesJoas Schilling2017-05-229-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Bump app versions as wellJoas Schilling2017-05-2222-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Adjust version requirementJoas Schilling2017-05-2222-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | We are working on 13 now!Roeland Jago Douma2017-05-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #5000 from nextcloud/phil-davis-filename-input-tooltipMorris Jobke2017-05-222-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make rename file tooltip error text change
| * | | | | Make new file file tooltip error text changePhil Davis2017-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Davis <phil@jankaritech.com>
| * | | | | Make rename file tooltip error text changePhil Davis2017-05-211-0/+2
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Phil Davis <phil@jankaritech.com>
* | | | | Merge pull request #5009 from nextcloud/update-acceptance-tests-for-issue-4921Roeland Jago Douma2017-05-221-1/+10
|\ \ \ \ \ | | | | | | | | | | | | Update acceptance tests for issue #4921
| * | | | | Update acceptance tests for issue #4921Daniel Calviño Sánchez2017-05-211-1/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acceptance tests opened the details view by clicking on the middle of the file row, but due to the changes made in issue #4921 that now opens the file instead; this commit updates the acceptance tests to open the details view through the "Details" item in the file actions menu. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | / / / [tx-robot] updated from transifexNextcloud bot2017-05-2232-40/+112
| |/ / / |/| | |
* | | | Merge pull request #5007 from nextcloud/fix_scss_cacheLukas Reschke2017-05-212-2/+4
|\ \ \ \ | | | | | | | | | | Fix scss cache
| * | | | Increase versionRoeland Jago Douma2017-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Set SCSS dependencies to memcache on compileRoeland Jago Douma2017-05-211-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Else when an upgrade happens we will recompile all the SCSS files all the time (until the cache expires). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | / v12.0.0Lukas Reschke2017-05-211-2/+2
| |_|/ |/| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4983 from nextcloud/master-oauth-not-disableMorris Jobke2017-05-203-6/+16
|\ \ \ | | | | | | | | Mark OAuth app as always enabled
| * | | Fix testsLukas Reschke2017-05-202-6/+15
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Mark OAuth app as always enabledLukas Reschke2017-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | At the moment we don't support disabling the OAuth app Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-2120-4/+704
| | | |