summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Adding ocs/v2.php with status code mapperThomas Müller2015-08-033-8/+118
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #18057 from owncloud/import_root_certificatesThomas Müller2015-08-055-10/+72
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | also block certificate management in the back-end if external storages are di...Bjoern Schiessle2015-08-043-9/+53
| * | | | | | | | | | only add the possibility to import ssl root certificates to the personalBjoern Schiessle2015-08-042-1/+19
* | | | | | | | | | | Merge pull request #18068 from owncloud/update-pearThomas Müller2015-08-051-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update submodule after merge in 3rdpartyThomas Müller2015-08-051-0/+0
| * | | | | | | | | | remove old pear classesThomas Müller2015-08-051-0/+0
| * | | | | | | | | | "pear/pear-core-minimal": "v1.10.0alpha2"Thomas Müller2015-08-051-0/+0
* | | | | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurableThomas Müller2015-08-053-1/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | make knowledge base url configurableBjoern Schiessle2015-07-293-1/+27
* | | | | | | | | | | | Merge pull request #18062 from owncloud/use-full-namespaceThomas Müller2015-08-052-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use absolute namespaceLukas Reschke2015-08-052-7/+7
* | | | | | | | | | | | Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttokenThomas Müller2015-08-053-7/+103
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove "use" statementLukas Reschke2015-08-052-4/+6
| * | | | | | | | | | | Use StringUtils::equals on CSRF token and add unit testsLukas Reschke2015-08-042-5/+99
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0Thomas Müller2015-08-046-25/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rebase upon newest masterLukas Reschke2015-08-041-0/+0
| * | | | | | | | | | | Update phpseclib to 2.0Andreas Fischer2015-08-036-25/+28
* | | | | | | | | | | | Merge pull request #18050 from owncloud/php7-catch-type-errorMorris Jobke2015-08-041-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [PHP 7] Change type hint to also accept ErrorsLukas Reschke2015-08-041-2/+2
* | | | | | | | | | | | | Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2Thomas Müller2015-08-041-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove pointless unit testThomas Müller2015-08-041-7/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #18037 from owncloud/shared-propagate-check-recipientThomas Müller2015-08-032-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix infinite loops with propagating etags on resharesRobin Appelman2015-08-032-7/+16
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #17820 from owncloud/dav-exception-log-classMorris Jobke2015-08-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | also log the class for dav exceptionsRobin Appelman2015-07-241-0/+1
* | | | | | | | | | | | 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