summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding ocs/v2.php with status code mapperThomas Müller2015-08-033-8/+118
* Merge pull request #18009 from owncloud/enc_always_update_file_cacheThomas Müller2015-08-032-8/+9
|\
| * always update file cache, the cache can handle partial data correctly if the ...Bjoern Schiessle2015-07-312-8/+9
* | Merge pull request #17989 from owncloud/enc_only_update_file_cache_onceBjörn Schießle2015-08-032-7/+22
|\ \
| * | only update database on the first run (first run = we have a version number f...Bjoern Schiessle2015-07-312-7/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-032-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-026-0/+12
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-0132-6/+74
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-31202-896/+390
* | Merge pull request #17805 from owncloud/avatar-handle-errorsRoeland Douma2015-07-314-6/+59
|\ \
| * | [avatar] add error handlers for avatar setupMorris Jobke2015-07-304-6/+59
* | | Merge pull request #17994 from owncloud/server-statusRobin McCorkell2015-07-302-13/+14
|\ \ \
| * | | correct order and capitalization of 'Server status' admin settings entry, fix...Jan-Christoph Borchardt2015-07-302-13/+14
* | | | Merge pull request #17993 from owncloud/simplecontainertest-fixRobin McCorkell2015-07-301-4/+2
|\ \ \ \
| * | | | Fix incorrect test namingRobin McCorkell2015-07-301-4/+2
* | | | | Merge pull request #17175 from owncloud/add-download-feedbackMorris Jobke2015-07-308-13/+147
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | move updateFileActionSpinner to OCA.Files.FileActionsMorris Jobke2015-07-223-24/+24
| * | | | refactor this to proper separation of concernsMorris Jobke2015-07-153-19/+39
| * | | | refactoring into proper methodsMorris Jobke2015-07-074-58/+65
| * | | | Fix unit tests and introduce better mocks of the HTMLMorris Jobke2015-07-072-7/+7
| * | | | Add proper download started feedbackMorris Jobke2015-07-073-12/+59
| * | | | Make download status fully visibleMorris Jobke2015-07-071-0/+8
| * | | | Reduce timeout for download spinner to 2 secondsMorris Jobke2015-07-072-2/+2
| * | | | Add loading spinner to multi select download buttonMorris Jobke2015-07-071-0/+20
| * | | | Fix layout of disabled links in the file listMorris Jobke2015-07-072-3/+27
| * | | | Add loading spinner to download iconMorris Jobke2015-07-071-0/+8
* | | | | Merge pull request #17981 from owncloud/correct-regexThomas Müller2015-07-302-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add more unit testsLukas Reschke2015-07-301-0/+2
| * | | | Correct regular expressionsLukas Reschke2015-07-302-2/+4
* | | | | Merge pull request #17963 from owncloud/remove-derecated-mysql-functionsMorris Jobke2015-07-309-155/+253
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Check for PDO instead of removed function for PHP 7 compatibilityLukas Reschke2015-07-302-12/+38
| * | | | properly mock dependencies for setup testsMorris Jobke2015-07-301-1/+7
| * | | | - more injectionThomas Müller2015-07-306-67/+119
| * | | | Moving mysql setup code over to DoctrineThomas Müller2015-07-295-95/+109
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-30112-172/+144
* | | | | Merge pull request #17814 from owncloud/update-moment-jsRobin McCorkell2015-07-295-3493/+4078
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | update moment.js to 2.10.3Morris Jobke2015-07-225-3493/+4078
* | | | | Merge pull request #17966 from owncloud/remove-mssqlThomas Müller2015-07-2914-284/+11
|\ \ \ \ \
| * | | | | fix unit testsMorris Jobke2015-07-291-2/+2
| * | | | | Remove remainings of mssqlThomas Müller2015-07-2914-282/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #17969 from owncloud/fix-log-file-checkRobin McCorkell2015-07-291-1/+4
|\ \ \ \ \
| * | | | | [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
|/ / / / /
* | | | | Merge pull request #17965 from owncloud/theme-colorMorris Jobke2015-07-293-0/+3
|\ \ \ \ \
| * | | | | add theme-color for better Android browser integrationJan-Christoph Borchardt2015-07-293-0/+3
| |/ / / /
* | | | | Merge pull request #17960 from owncloud/inline-buttonMorris Jobke2015-07-293-2/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | use inline confirm button style for password-protected links, ref #15176Jan-Christoph Borchardt2015-07-293-2/+10
* | | | | Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydef...Robin McCorkell2015-07-293-2/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix watcher tests to explicitly set policyVincent Petry2015-07-291-0/+3
| * | | | Disable filesystem_check_changes by defaultVincent Petry2015-07-292-2/+2
* | | | | Merge pull request #17923 from owncloud/fix-17921blizzz2015-07-291-8/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |