Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | delete cached preview when rolling back file's version | Georg Ehrke | 2015-09-20 | 4 | -1/+49 |
| | | | | | | | | add random number using OC.parseQueryString and _.extend() version rollback: add missing prefix to OC\Preview::post_delete add test to assure that the rollback hook is called | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-20 | 18 | -0/+46 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-19 | 4 | -0/+6 |
| | |||||
* | 8.2 beta1v8.2beta1 | C Montero-Luque | 2015-09-18 | 1 | -2/+2 |
| | |||||
* | Merge pull request #19008 from owncloud/jquery_avatar_tests | Thomas Müller | 2015-09-18 | 2 | -1/+241 |
|\ | | | | | JS tests for jquery.avatar | ||||
| * | Added js tests for jquery.avatar | Roeland Jago Douma | 2015-09-14 | 2 | -1/+241 |
| | | | | | | | | * Ceil avatar request size | ||||
* | | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7 | Thomas Müller | 2015-09-18 | 2 | -4/+1 |
|\ \ | | | | | | | [jenkins] changed ZipStreamer to use composer for updates, update to 0.7 | ||||
| * \ | Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core ↵ | Thomas Müller | 2015-09-18 | 2 | -4/+1 |
| |\ \ | | | | | | | | | | | | | into McNetic-zipstreamer-0.7 | ||||
| | * | | adapted to changed subproject commit | Nicolai Ehemann | 2015-09-18 | 1 | -0/+0 |
| | | | | |||||
| | * | | use zipstreamer via composer | Nicolai Ehemann | 2015-09-14 | 2 | -3/+0 |
| | | | | |||||
| | * | | lib/private/files.php: adapted to minimally changed ZipStreamer API | Nicolai Ehemann | 2015-09-14 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #19098 from owncloud/db-lock-no-transaction | Thomas Müller | 2015-09-18 | 3 | -17/+90 |
|\ \ \ \ | | | | | | | | | | | Remove the need for the transaction in the database locking backend | ||||
| * | | | | improve doc | Robin Appelman | 2015-09-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | expire old lock rows | Robin Appelman | 2015-09-17 | 3 | -13/+101 |
| | | | | | |||||
| * | | | | Remove the need for the transaction in the database locking backend | Robin Appelman | 2015-09-17 | 1 | -16/+1 |
| | | | | | |||||
* | | | | | Merge pull request #19058 from owncloud/multiselect-bar-style | Thomas Müller | 2015-09-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | adjust multiselect bar to controls bar, fix #18989 | ||||
| * | | | | | adjust multiselect bar to controls bar, fix #18989 | Jan-Christoph Borchardt | 2015-09-15 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #18901 from owncloud/encryption-dav-tests | Thomas Müller | 2015-09-18 | 5 | -9/+143 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add tests for doing dav requests with encryption enabled | ||||
| * | | | | | reuse the same datadir | Robin Appelman | 2015-09-18 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Add tests for doing dav requests with encryption enabled | Robin Appelman | 2015-09-18 | 1 | -0/+25 |
| | | | | | | |||||
| * | | | | | Add trait to enable encryption for a unit test | Robin Appelman | 2015-09-18 | 1 | -0/+104 |
| | | | | | | |||||
| * | | | | | create new mounts every time the mount provider is called | Robin Appelman | 2015-09-18 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | important for storage wrappers | ||||
| * | | | | | clear up tests a bit | Robin Appelman | 2015-09-18 | 1 | -6/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #17689 from owncloud/repair-ocs-ids | Thomas Müller | 2015-09-18 | 4 | -2/+198 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add repair step for outdated OCS IDs | ||||
| * | | | | | | Prefer OCS Id from database | Lukas Reschke | 2015-09-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id. | ||||
| * | | | | | | Add repair step for outdated OCS IDs | Lukas Reschke | 2015-09-18 | 3 | -2/+192 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved") To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually. | ||||
* | | | | | | Merge pull request #18911 from owncloud/preview-show-cached-directly | Thomas Müller | 2015-09-18 | 1 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Show cached previews directly | ||||
| * | | | | | | Show cached previews directly | Robin Appelman | 2015-09-08 | 1 | -0/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #18840 from owncloud/fix-app-disable-route | Thomas Müller | 2015-09-18 | 3 | -50/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Rebuild app navigation in JS | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into fix-app-disable-route | Robin McCorkell | 2015-09-14 | 644 | -4844/+10008 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Get sorted navigation list | Robin McCorkell | 2015-09-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Rebuild app navigation in JS | Robin McCorkell | 2015-09-05 | 3 | -50/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieve all app navigations to prevent reloading appinfo/app.php and causing an error when the app isn't fully loaded. The addition/deletion logic has been moved to JS, simplifying a lot of code. | ||||
* | | | | | | | | | Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db | Thomas Müller | 2015-09-18 | 8 | -1/+245 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add Trashbin expiration cronjob | ||||
| * | | | | | | | | | Log deleted files | Victor Dubiniuk | 2015-09-16 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add PHPDoc | Lukas Reschke | 2015-09-16 | 2 | -2/+16 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Updates according to review | Victor Dubiniuk | 2015-09-16 | 2 | -11/+23 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix tests | Victor Dubiniuk | 2015-09-16 | 1 | -3/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add expiration cronjob | Victor Dubiniuk | 2015-09-16 | 8 | -1/+212 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #18983 from owncloud/fix_18926 | Thomas Müller | 2015-09-18 | 3 | -5/+71 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | check for the right user if we can change his password | ||||
| * | | | | | | | | | | check for the right user if we can change his password | Bjoern Schiessle | 2015-09-14 | 3 | -5/+71 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #18679 from owncloud/add-reshare-activities | Thomas Müller | 2015-09-18 | 1 | -4/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add reshare activities for the parent sharee and the original file owner | ||||
| * | | | | | | | | | | | Add reshare activities for the parent sharee and the original file owner | Joas Schilling | 2015-09-15 | 1 | -4/+38 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #18986 from owncloud/federated_capabilities | Thomas Müller | 2015-09-18 | 2 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose federated sharing capabilities to authenticated users | ||||
| * | | | | | | | | | | | | Expose federated sharing capabilities to authenticated users | Roeland Jago Douma | 2015-09-15 | 2 | -0/+42 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #19087 from ↵ | Thomas Müller | 2015-09-18 | 3 | -7/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/disable-remote-share-notifications-for-now Disable remote share notifications for now | ||||
| * | | | | | | | | | | | | | Disable the remote sharing notifications until they work properly | Joas Schilling | 2015-09-17 | 3 | -2/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Change the order of the buttons | Joas Schilling | 2015-09-17 | 1 | -5/+5 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiers | Thomas Müller | 2015-09-18 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow checking whether there are notifiers registered | ||||
| * | | | | | | | | | | | | | Allow checking whether there are notifiers registered | Joas Schilling | 2015-09-17 | 2 | -0/+14 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #19017 from owncloud/dav-download-tests | Thomas Müller | 2015-09-18 | 2 | -1/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | Add tests for downloading files over dav |