Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Adding ocs/v2.php with status code mapper | Thomas Müller | 2015-08-03 | 3 | -8/+118 | |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #18057 from owncloud/import_root_certificates | Thomas Müller | 2015-08-05 | 5 | -10/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | also block certificate management in the back-end if external storages are di... | Bjoern Schiessle | 2015-08-04 | 3 | -9/+53 | |
| * | | | | | | | | | | only add the possibility to import ssl root certificates to the personal | Bjoern Schiessle | 2015-08-04 | 2 | -1/+19 | |
* | | | | | | | | | | | Merge pull request #18068 from owncloud/update-pear | Thomas Müller | 2015-08-05 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update submodule after merge in 3rdparty | Thomas Müller | 2015-08-05 | 1 | -0/+0 | |
| * | | | | | | | | | | remove old pear classes | Thomas Müller | 2015-08-05 | 1 | -0/+0 | |
| * | | | | | | | | | | "pear/pear-core-minimal": "v1.10.0alpha2" | Thomas Müller | 2015-08-05 | 1 | -0/+0 | |
* | | | | | | | | | | | Merge pull request #17961 from owncloud/make_knowledgebase_configurable | Thomas Müller | 2015-08-05 | 3 | -1/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | make knowledge base url configurable | Bjoern Schiessle | 2015-07-29 | 3 | -1/+27 | |
* | | | | | | | | | | | | Merge pull request #18062 from owncloud/use-full-namespace | Thomas Müller | 2015-08-05 | 2 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use absolute namespace | Lukas Reschke | 2015-08-05 | 2 | -7/+7 | |
* | | | | | | | | | | | | Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttoken | Thomas Müller | 2015-08-05 | 3 | -7/+103 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove "use" statement | Lukas Reschke | 2015-08-05 | 2 | -4/+6 | |
| * | | | | | | | | | | | Use StringUtils::equals on CSRF token and add unit tests | Lukas Reschke | 2015-08-04 | 2 | -5/+99 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #18024 from owncloud/phpseclib-2.0 | Thomas Müller | 2015-08-04 | 6 | -25/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Rebase upon newest master | Lukas Reschke | 2015-08-04 | 1 | -0/+0 | |
| * | | | | | | | | | | | Update phpseclib to 2.0 | Andreas Fischer | 2015-08-03 | 6 | -25/+28 | |
* | | | | | | | | | | | | Merge pull request #18050 from owncloud/php7-catch-type-error | Morris Jobke | 2015-08-04 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | [PHP 7] Change type hint to also accept Errors | Lukas Reschke | 2015-08-04 | 1 | -2/+2 | |
* | | | | | | | | | | | | | Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2 | Thomas Müller | 2015-08-04 | 1 | -7/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Remove pointless unit test | Thomas Müller | 2015-08-04 | 1 | -7/+0 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #18037 from owncloud/shared-propagate-check-recipient | Thomas Müller | 2015-08-03 | 2 | -7/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fix infinite loops with propagating etags on reshares | Robin Appelman | 2015-08-03 | 2 | -7/+16 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #17820 from owncloud/dav-exception-log-class | Morris Jobke | 2015-08-03 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | also log the class for dav exceptions | Robin Appelman | 2015-07-24 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge pull request #18009 from owncloud/enc_always_update_file_cache | Thomas Müller | 2015-08-03 | 2 | -8/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | always update file cache, the cache can handle partial data correctly if the ... | Bjoern Schiessle | 2015-07-31 | 2 | -8/+9 | |
* | | | | | | | | | | | | Merge pull request #17989 from owncloud/enc_only_update_file_cache_once | Björn Schießle | 2015-08-03 | 2 | -7/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | only update database on the first run (first run = we have a version number f... | Bjoern Schiessle | 2015-07-31 | 2 | -7/+22 | |
* | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-03 | 2 | -2/+2 | |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-02 | 6 | -0/+12 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-01 | 32 | -6/+74 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-31 | 202 | -896/+390 | |
* | | | | | | | | | | | Merge pull request #17805 from owncloud/avatar-handle-errors | Roeland Douma | 2015-07-31 | 4 | -6/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [avatar] add error handlers for avatar setup | Morris Jobke | 2015-07-30 | 4 | -6/+59 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #17994 from owncloud/server-status | Robin McCorkell | 2015-07-30 | 2 | -13/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | correct order and capitalization of 'Server status' admin settings entry, fix... | Jan-Christoph Borchardt | 2015-07-30 | 2 | -13/+14 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #17993 from owncloud/simplecontainertest-fix | Robin McCorkell | 2015-07-30 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix incorrect test naming | Robin McCorkell | 2015-07-30 | 1 | -4/+2 | |
* | | | | | | | | | | | | Merge pull request #17175 from owncloud/add-download-feedback | Morris Jobke | 2015-07-30 | 8 | -13/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | move updateFileActionSpinner to OCA.Files.FileActions | Morris Jobke | 2015-07-22 | 3 | -24/+24 | |
| * | | | | | | | | | | | refactor this to proper separation of concerns | Morris Jobke | 2015-07-15 | 3 | -19/+39 | |
| * | | | | | | | | | | | refactoring into proper methods | Morris Jobke | 2015-07-07 | 4 | -58/+65 | |
| * | | | | | | | | | | | Fix unit tests and introduce better mocks of the HTML | Morris Jobke | 2015-07-07 | 2 | -7/+7 | |
| * | | | | | | | | | | | Add proper download started feedback | Morris Jobke | 2015-07-07 | 3 | -12/+59 | |
| * | | | | | | | | | | | Make download status fully visible | Morris Jobke | 2015-07-07 | 1 | -0/+8 | |
| * | | | | | | | | | | | Reduce timeout for download spinner to 2 seconds | Morris Jobke | 2015-07-07 | 2 | -2/+2 | |
| * | | | | | | | | | | | Add loading spinner to multi select download button | Morris Jobke | 2015-07-07 | 1 | -0/+20 | |
| * | | | | | | | | | | | Fix layout of disabled links in the file list | Morris Jobke | 2015-07-07 | 2 | -3/+27 |