summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21435 from owncloud/improved_upgrade_messagesBjörn Schießle2016-01-042-4/+4
|\
| * don't show previous log level in upgrade messageBjörn Schießle2016-01-042-4/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-0416-2/+100
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-022-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-012-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-3130-4/+160
* Merge pull request #21402 from owncloud/view-getuserobject-cacheThomas Müller2015-12-301-1/+4
|\
| * Cache usermanager instance in viewRobin Appelman2015-12-301-1/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-30114-116/+2
* | Merge pull request #21149 from owncloud/quota-wordingThomas Müller2015-12-291-1/+1
|\ \
| * | shorten quota usage wording, fix overflow on mobile, fix #21129Jan-Christoph Borchardt2015-12-281-1/+1
| |/
* | Merge pull request #21331 from switch-ch/fix_ms_logThomas Müller2015-12-291-1/+1
|\ \ | |/ |/|
| * When microtime(true) returns a whole number, then the parsing fails.Christian Schnidrig2015-12-221-1/+1
* | Merge pull request #21364 from owncloud/bring_back_icons_filepickerThomas Müller2015-12-281-0/+1
|\ \
| * | Since the server no longer calculates the iconRoeland Jago Douma2015-12-241-0/+1
* | | Merge pull request #21291 from owncloud/refactor-call-checkThomas Müller2015-12-286-27/+7
|\ \ \
| * | | Refactor OC_Util::callCheckMorris Jobke2015-12-226-27/+7
* | | | Merge pull request #21254 from owncloud/files-uploadcanceliconfixThomas Müller2015-12-282-23/+36
|\ \ \ \
| * | | | Use showBusyState for upload into folderVincent Petry2015-12-181-22/+20
| * | | | Correctly render uploadtext indicator only on foldersVincent Petry2015-12-182-1/+16
* | | | | Merge pull request #21216 from owncloud/fopen-statcacheThomas Müller2015-12-282-2/+20
|\ \ \ \ \
| * | | | | clear statcache after fopen for smbRobin Appelman2015-12-151-2/+7
| * | | | | test for statcache after fopenRobin Appelman2015-12-151-0/+13
* | | | | | Merge pull request #17333 from owncloud/php7-scalar-types-controllersThomas Müller2015-12-282-10/+35
|\ \ \ \ \ \
| * | | | | | Fix unit testRoeland Jago Douma2015-12-241-2/+6
| * | | | | | prefer scalar type hints over phpdoc annotationBernhard Posselt2015-12-242-10/+31
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #20992 from owncloud/log-in-noselectThomas Müller2015-12-281-0/+16
|\ \ \ \ \ \
| * | | | | | prevent selecting on log in page to solve ugliness on accidental selectionJan-Christoph Borchardt2015-12-241-0/+16
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-2816-2/+86
* | | | | | | Merge pull request #21368 from owncloud/xenopathic-mailmapThomas Müller2015-12-272-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Add mention bot for Robin McCorkellRobin McCorkell2015-12-241-0/+4
| * | | | | | | Correct mailmap for Robin McCorkell to robin@mccorkell.me.ukRobin McCorkell2015-12-241-1/+2
| |/ / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-278-0/+32
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-256-0/+18
* | | | | | | Merge pull request #21093 from owncloud/migrate-no-userRobin Appelman2015-12-243-13/+61
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Migrate files external for the user that the filesystem is being setup forRobin Appelman2015-12-143-13/+61
* | | | | | | Merge pull request #21323 from owncloud/placeholder_sane_precissionRoeland Douma2015-12-241-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [Avatars] Calculate 'sane' hue precissionsRoeland Jago Douma2015-12-241-2/+2
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-2410-0/+56
* | | | | | Merge pull request #21347 from owncloud/fix-unit-tests-on-masterThomas Müller2015-12-231-6/+6
|\ \ \ \ \ \
| * | | | | | Fix unit testsLukas Reschke2015-12-231-6/+6
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-2366-280/+2
* | | | | | Merge pull request #21318 from ryno83/target_blank_for_links_in_setupcheckThomas Müller2015-12-231-6/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | add _blank to hrefRenaud Fortier2015-12-211-6/+6
* | | | | | Merge pull request #21325 from owncloud/files-donotduplicatewebdavpropertiesThomas Müller2015-12-221-1/+1
|\ \ \ \ \ \
| * | | | | | Make a modifiable copy of the webdav properties in JS file listVincent Petry2015-12-221-1/+1
|/ / / / / /
* | | | | | Merge pull request #21287 from owncloud/travis-dav-caldavtesterThomas Müller2015-12-227-5/+3704
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Adding integration tests for CalDAVThomas Müller2015-12-217-5/+3704
| |/ / / /
* | | | | Merge pull request #21312 from owncloud/fed-handshake-loggingThomas Müller2015-12-225-10/+37
|\ \ \ \ \
| * | | | | Add error logging to federated sharing handshakeRobin Appelman2015-12-215-10/+37
| |/ / / /