summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
* Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolderVincent Petry2016-06-171-1/+1
|\
| * Use getLazyRootFolder from RemoveRootShares repair stepVincent Petry2016-06-171-1/+1
* | Added test with new endpoint (#23934)Sergio Bertolín2016-06-172-37/+55
* | Merge pull request #25153 from owncloud/fix-problem-added-in-25023Vincent Petry2016-06-171-1/+1
|\ \ | |/ |/|
| * Changed global variable to localSergio Bertolín2016-06-171-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-1728-6/+176
* Merge pull request #24965 from owncloud/streams-0.4.1Vincent Petry2016-06-166-52/+39
|\
| * Update submodule for 3rdparty icewind/streams updateVincent Petry2016-06-161-0/+0
| * update icewind/streams to 0.4.1Robin Appelman2016-06-155-52/+39
| * update icewind/streams to 0.4.1Robin Appelman2016-06-151-0/+0
* | Merge pull request #25132 from owncloud/2fa-load-apps-before-queryVincent Petry2016-06-162-1/+24
|\ \
| * | assert app is loaded in unit testsChristoph Wurst2016-06-161-0/+7
| * | load 2FA provider apps before querying classesChristoph Wurst2016-06-162-1/+17
* | | Merge pull request #25146 from owncloud/butonic-patch-1Vincent Petry2016-06-161-1/+1
|\ \ \
| * | | emit correct signal when disabling an appJörn Friedrich Dreyer2016-06-161-1/+1
* | | | Merge pull request #25147 from owncloud/setup-advanced-toggleVincent Petry2016-06-161-1/+2
|\ \ \ \
| * | | | Prevent the advanced options toggle in the setup from acting as a linkRobin Appelman2016-06-161-1/+2
* | | | | Move birthday calendar generation to a live migration job (#25135)Thomas Müller2016-06-165-66/+84
* | | | | Merge pull request #25104 from owncloud/dropbox-catchratelimitVincent Petry2016-06-161-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-141-0/+5
* | | | | Merge pull request #25142 from owncloud/fix-grouped-inputsVincent Petry2016-06-161-13/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-161-13/+13
* | | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolderVincent Petry2016-06-162-1/+43
|\ \ \ \ \
| * | | | | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| | |/ / / | |/| | |
* | | | | Merge pull request #24252 from owncloud/integration_test_favoritesVincent Petry2016-06-162-2/+90
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added unfavoriting tests and some rewordingSergio Bertolín2016-06-152-8/+36
| * | | | Fixing the testsSergio Bertolín2016-06-152-21/+20
| * | | | Added favorites integration testsDavid Toledo2016-06-152-1/+62
* | | | | load authentication apps first (#25126)Christoph Wurst2016-06-161-0/+2
| |_|/ / |/| | |
* | | | Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_userVincent Petry2016-06-163-16/+46
|\ \ \ \
| * | | | Fix unit testsRoeland Jago Douma2016-06-141-0/+7
| * | | | Fix case with no userRoeland Jago Douma2016-06-142-1/+10
| * | | | Optimize isSharingDisabledForuserRoeland Jago Douma2016-06-142-16/+30
* | | | | Merge pull request #25075 from owncloud/fix_23265Vincent Petry2016-06-163-0/+353
|\ \ \ \ \
| * | | | | Remove shares of the root folderRoeland Jago Douma2016-06-133-0/+353
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-162-0/+2
| |_|/ / / |/| | | |
* | | | | Merge pull request #25056 from owncloud/fs-usermountcache-cappedVincent Petry2016-06-151-3/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Capped cache for cache info in UserMountCacheVincent Petry2016-06-131-3/+14
* | | | | Merge pull request #25093 from owncloud/issue-12816-clean-tags-from-deleted-u...Vincent Petry2016-06-153-5/+82
|\ \ \ \ \
| * | | | | Clean up tags of deleted usersJoas Schilling2016-06-143-5/+82
| | |_|_|/ | |/| | |
* | | | | Merge pull request #25102 from owncloud/preview-delete-performanceVincent Petry2016-06-152-12/+27
|\ \ \ \ \
| * | | | | optimized size propagation on deletesRobin Appelman2016-06-141-4/+14
| * | | | | propagator batching when removing thumbnailsRobin Appelman2016-06-141-7/+13
| * | | | | remvoe duplicate rmdirRobin Appelman2016-06-141-1/+0
* | | | | | Merge pull request #25082 from owncloud/fix-sessionless-clientsVincent Petry2016-06-155-20/+68
|\ \ \ \ \ \
| * | | | | | create session token only for clients that support cookiesChristoph Wurst2016-06-133-17/+61
| * | | | | | create session token on all APIsChristoph Wurst2016-06-133-5/+9
| |/ / / / /
* | | | | | Update start-swift-ceph.sh (#25109)Jürgen Weigert2016-06-151-0/+3
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1516-2/+80
| |/ / / / |/| | | |