aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* delete cached preview when rolling back file's versionGeorg Ehrke2015-09-204-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 transifexJenkins for ownCloud2015-09-2018-0/+46
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-194-0/+6
|
* 8.2 beta1v8.2beta1C Montero-Luque2015-09-181-2/+2
|
* Merge pull request #19008 from owncloud/jquery_avatar_testsThomas Müller2015-09-182-1/+241
|\ | | | | JS tests for jquery.avatar
| * Added js tests for jquery.avatarRoeland Jago Douma2015-09-142-1/+241
| | | | | | | | * Ceil avatar request size
* | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7Thomas Müller2015-09-182-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üller2015-09-182-4/+1
| |\ \ | | | | | | | | | | | | into McNetic-zipstreamer-0.7
| | * | adapted to changed subproject commitNicolai Ehemann2015-09-181-0/+0
| | | |
| | * | use zipstreamer via composerNicolai Ehemann2015-09-142-3/+0
| | | |
| | * | lib/private/files.php: adapted to minimally changed ZipStreamer APINicolai Ehemann2015-09-142-2/+2
| | | |
* | | | Merge pull request #19098 from owncloud/db-lock-no-transactionThomas Müller2015-09-183-17/+90
|\ \ \ \ | | | | | | | | | | Remove the need for the transaction in the database locking backend
| * | | | improve docRobin Appelman2015-09-171-1/+1
| | | | |
| * | | | expire old lock rowsRobin Appelman2015-09-173-13/+101
| | | | |
| * | | | Remove the need for the transaction in the database locking backendRobin Appelman2015-09-171-16/+1
| | | | |
* | | | | Merge pull request #19058 from owncloud/multiselect-bar-styleThomas Müller2015-09-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | adjust multiselect bar to controls bar, fix #18989
| * | | | | adjust multiselect bar to controls bar, fix #18989Jan-Christoph Borchardt2015-09-151-1/+1
| | | | | |
* | | | | | Merge pull request #18901 from owncloud/encryption-dav-testsThomas Müller2015-09-185-9/+143
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add tests for doing dav requests with encryption enabled
| * | | | | reuse the same datadirRobin Appelman2015-09-181-1/+2
| | | | | |
| * | | | | Add tests for doing dav requests with encryption enabledRobin Appelman2015-09-181-0/+25
| | | | | |
| * | | | | Add trait to enable encryption for a unit testRobin Appelman2015-09-181-0/+104
| | | | | |
| * | | | | create new mounts every time the mount provider is calledRobin Appelman2015-09-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | important for storage wrappers
| * | | | | clear up tests a bitRobin Appelman2015-09-181-6/+8
| | | | | |
* | | | | | Merge pull request #17689 from owncloud/repair-ocs-idsThomas Müller2015-09-184-2/+198
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add repair step for outdated OCS IDs
| * | | | | | Prefer OCS Id from databaseLukas Reschke2015-09-181-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 IDsLukas Reschke2015-09-183-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-directlyThomas Müller2015-09-181-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show cached previews directly
| * | | | | | Show cached previews directlyRobin Appelman2015-09-081-0/+6
| | | | | | |
* | | | | | | Merge pull request #18840 from owncloud/fix-app-disable-routeThomas Müller2015-09-183-50/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Rebuild app navigation in JS
| * \ \ \ \ \ \ Merge branch 'master' into fix-app-disable-routeRobin McCorkell2015-09-14644-4844/+10008
| |\ \ \ \ \ \ \
| * | | | | | | | Get sorted navigation listRobin McCorkell2015-09-061-1/+1
| | | | | | | | |
| * | | | | | | | Rebuild app navigation in JSRobin McCorkell2015-09-053-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-dbThomas Müller2015-09-188-1/+245
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Trashbin expiration cronjob
| * | | | | | | | | Log deleted filesVictor Dubiniuk2015-09-161-0/+4
| | | | | | | | | |
| * | | | | | | | | Add PHPDocLukas Reschke2015-09-162-2/+16
| | | | | | | | | |
| * | | | | | | | | Updates according to reviewVictor Dubiniuk2015-09-162-11/+23
| | | | | | | | | |
| * | | | | | | | | Fix testsVictor Dubiniuk2015-09-161-3/+6
| | | | | | | | | |
| * | | | | | | | | Add expiration cronjobVictor Dubiniuk2015-09-168-1/+212
| | | | | | | | | |
* | | | | | | | | | Merge pull request #18983 from owncloud/fix_18926Thomas Müller2015-09-183-5/+71
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | check for the right user if we can change his password
| * | | | | | | | | | check for the right user if we can change his passwordBjoern Schiessle2015-09-143-5/+71
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #18679 from owncloud/add-reshare-activitiesThomas Müller2015-09-181-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 ownerJoas Schilling2015-09-151-4/+38
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #18986 from owncloud/federated_capabilitiesThomas Müller2015-09-182-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Expose federated sharing capabilities to authenticated users
| * | | | | | | | | | | | Expose federated sharing capabilities to authenticated usersRoeland Jago Douma2015-09-152-0/+42
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #19087 from ↵Thomas Müller2015-09-183-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/disable-remote-share-notifications-for-now Disable remote share notifications for now
| * | | | | | | | | | | | | Disable the remote sharing notifications until they work properlyJoas Schilling2015-09-173-2/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Change the order of the buttonsJoas Schilling2015-09-171-5/+5
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #19092 from owncloud/allow-checking-for-notifiersThomas Müller2015-09-182-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow checking whether there are notifiers registered
| * | | | | | | | | | | | | Allow checking whether there are notifiers registeredJoas Schilling2015-09-172-0/+14
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #19017 from owncloud/dav-download-testsThomas Müller2015-09-182-1/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Add tests for downloading files over dav