summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* no auto-fetch in modelArthur Schiwon2015-09-162-1/+1
* simplification, and throwing where throwing is neededArthur Schiwon2015-09-164-12/+8
* Fix share permissions for share tabVincent Petry2015-09-161-2/+1
* Add share dialog into share tabVincent Petry2015-09-163-13/+42
* integraton noshare part into ShareDialogLinkShareViewArthur Schiwon2015-09-162-44/+33
* less stupid initalization of subviewsArthur Schiwon2015-09-161-11/+11
* split off expirationViewArthur Schiwon2015-09-163-39/+109
* split off linkShareViewArthur Schiwon2015-09-163-80/+158
* ShareDialogResharerInfoView improvementsArthur Schiwon2015-09-163-9/+10
* split ShareDialogResharerInfoView from base viewArthur Schiwon2015-09-164-43/+138
* show tooltips and load avatarArthur Schiwon2015-09-161-1/+5
* improve docArthur Schiwon2015-09-161-1/+3
* move remaining global settings to configModelArthur Schiwon2015-09-162-5/+33
* further work on reimplementing the dialog layoutArthur Schiwon2015-09-165-17/+193
* improve reshare rendering part and move permission calculation to modelArthur Schiwon2015-09-163-39/+87
* switch to async item loading, take care stuff is updated subsequentlyArthur Schiwon2015-09-162-5/+25
* make loadItems work async if a callback is providedArthur Schiwon2015-09-161-2/+7
* model now extends Backbone's model and isadjustedArthur Schiwon2015-09-161-13/+27
* started to port the Model to Backbone`sArthur Schiwon2015-09-162-27/+19
* remove possibly unreliable code and fix JSdocArthur Schiwon2015-09-161-8/+9
* share dialog view takes advantage of OC.Backbone.ViewArthur Schiwon2015-09-162-77/+43
* refactor share dialog for multi-purpose use (dropdown, sidebar) and better ma...Arthur Schiwon2015-09-166-3/+462
* Merge pull request #19014 from owncloud/dont-add-requestheaders-for-cross-dom...Thomas Müller2015-09-162-3/+19
|\
| * Merge branch 'master' into dont-add-requestheaders-for-cross-domain-requestsLukas Reschke2015-09-155-8/+19
| |\
| * | Disable automatic evaluation of responsesLukas Reschke2015-09-151-0/+14
| * | Do not add sensitive request headers for cross domain requestsLukas Reschke2015-09-151-3/+5
* | | Merge pull request #18979 from owncloud/sidebare-preview-fixesThomas Müller2015-09-164-48/+83
|\ \ \
| * | | fix filename display in sidebar, fix #18981Jan-Christoph Borchardt2015-09-151-0/+3
| * | | fix small mimetype iconsRobin Appelman2015-09-151-3/+3
| * | | recognize eps, psd and illustrator as imageRobin Appelman2015-09-151-1/+7
| * | | crop to the center for landscape imagesRobin Appelman2015-09-151-1/+5
| * | | Various thumbnail fixesRobin Appelman2015-09-151-44/+62
| * | | Fix path for fileinfomodel in subdirectoriesRobin Appelman2015-09-151-1/+1
| * | | normal margins for portrait previewsRobin Appelman2015-09-151-0/+4
* | | | Merge pull request #18938 from owncloud/occ_decrypt_all2Thomas Müller2015-09-1615-4/+1482
|\ \ \ \
| * | | | occ script to disable encryption and to decrypt all files againBjoern Schiessle2015-09-1515-4/+1482
* | | | | Merge pull request #19052 from owncloud/revert-14856-remote_avatarsThomas Müller2015-09-162-22/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Allow Remote avatars"Thomas Müller2015-09-152-22/+13
* | | | | Merge pull request #18368 from owncloud/version-retentionLukas Reschke2015-09-155-7/+480
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into version-retentionLukas Reschke2015-09-1513-171/+306
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logicRobin Appelman2015-09-153-100/+18
|\ \ \ \ \ \
| * | | | | | Use the view logic for getFolderContent for the node apiRobin Appelman2015-09-083-100/+18
* | | | | | | Merge pull request #17811 from owncloud/dav-lock-wideRobin Appelman2015-09-158-68/+287
|\ \ \ \ \ \ \
| * | | | | | | allow hook cancelRobin Appelman2015-09-141-4/+9
| * | | | | | | fix chunking testsRobin Appelman2015-09-141-0/+2
| * | | | | | | use the correct path for cache updates when doing chunked assemblyRobin Appelman2015-09-141-7/+13
| * | | | | | | also verify cache in dav upload testsRobin Appelman2015-09-141-1/+21
| * | | | | | | work directly on storages when doing a chunked upload assemblyRobin Appelman2015-09-142-57/+87
| * | | | | | | handle notfound exceptions in lock pluginRobin Appelman2015-09-141-1/+5
| * | | | | | | adjust tests to handle before/after lockingRobin Appelman2015-09-141-5/+43