summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* style fixesGeorg Ehrke2013-07-302-2/+2
* Merge branch 'master' into oc_previewThomas Müller2013-07-3023-79/+158
|\
| * Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-295-6/+20
| |\
| | * remove whitespacesBjoern Schiessle2013-07-291-1/+1
| | * fix typoBjörn Schießle2013-07-261-1/+1
| | * disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-265-7/+21
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-291-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-271-0/+2
| |/
| * Merge branch 'master' into sabre-objecttreeRobin Appelman2013-07-2470-212/+480
| |\
| | * Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2418-69/+120
| | |\
| | | * Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-2222-78/+100
| | | |\
| | | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-2223-22/+3
| | | | * Merge pull request #4131 from owncloud/scanner-splitBart Visscher2013-07-211-45/+29
| | | | |\
| | | | | * Split scanning logic from ajax fileRobin Appelman2013-07-191-45/+29
| | | | * | Merge pull request #4118 from owncloud/remove-size-experimentMorris Jobke2013-07-214-10/+5
| | | | |\ \
| | | | | * | finally remove the file size obfuscation as it had more disadvantages. I was ...Jan-Christoph Borchardt2013-07-184-10/+5
| | | | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-211-0/+6
| | | | | |/ | | | | |/|
| | | | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-192-11/+18
| | | | |/
| | | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-183-1/+3
| | | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-173-0/+8
| | | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-161-0/+4
| | | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-142-1/+27
| | | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-132-0/+9
| | | * | in case the encryption app is enabled we cannot yet allow anonymous uploadThomas Müller2013-07-121-1/+5
| | | * | new admin setting added which allows to turn off anonymous uploadsThomas Müller2013-07-122-1/+2
| | | |/
| | | * add new file above summary if it is the first file in the listBjörn Schießle2013-07-121-0/+2
| | | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-1210-1/+23
| | * | use $defaults->getName() as webdav REALMJörn Friedrich Dreyer2013-07-231-1/+2
| | |/
| | * [tx-robot] updated from transifexJenkins for ownCloud2013-07-112-0/+7
| | * Merge pull request #3990 from owncloud/size-mbJan-Christoph Borchardt2013-07-101-1/+1
| | |\
| | | * add MB indicator to size heading, fix #3987Jan-Christoph Borchardt2013-07-101-1/+1
| * | | use new ObjectTree in sabredavRobin Appelman2013-06-301-3/+4
* | | | add class='preview-icon' to rows in file app that make use of previewsGeorg Ehrke2013-07-291-2/+10
* | | | implement use of previews in sharing appGeorg Ehrke2013-07-112-1/+9
* | | | merge conflicts ...Georg Ehrke2013-07-1075-634/+1161
|\ \ \ \ | | |/ / | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-101-3/+8
| | |/ | |/|
| * | Migrate to encodePathVictor Dubiniuk2013-07-092-6/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-092-1/+9
| * | Merge pull request #3946 from owncloud/fixing-3942-masterThomas Müller2013-07-082-16/+14
| |\ \
| | * \ Merge branch 'master' into fixing-3942-masterThomas Müller2013-07-061-1/+1
| | |\ \
| | * | | on reshares we now recursively move to the root of all reshares - therefore s...Thomas Müller2013-07-051-15/+14
| | * | | fixing Notice: Undefined index: isPublicThomas Müller2013-07-051-0/+1
| | * | | handle anonymous upload to reshared folderThomas Müller2013-07-051-0/+5
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-0/+2
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-074-0/+14
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-063-1/+14
| | |/ / | |/| |
| * | | proper fix for getting the shared item if no user is logged inThomas Müller2013-07-051-4/+5
| * | | php 5.3 compliant nowThomas Müller2013-07-051-1/+2
| * | | get the real physical folder name for anonymous uploadThomas Müller2013-07-051-2/+7
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0546-9/+114