summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-161-4/+4
|\
| * remove unneeded icon classJan-Christoph Borchardt2014-03-141-4/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-161-0/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-153-0/+11
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-134-0/+110
* Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
|\
| * Update index.phpFrancesco Piraneo G.2014-03-111-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-131-0/+5
* | Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-masterLukas Reschke2014-03-121-1/+0
|\ \
| * | remove Sabre_DAV_Browser_PluginThomas Müller2014-03-121-1/+0
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2014-03-1210-32/+78
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1162-307/+335
* Merge pull request #7629 from owncloud/files-allfileswarningtypoVincent Petry2014-03-101-1/+1
|\
| * Fixed log warning when deleting a single fileVincent Petry2014-03-071-1/+1
* | only initialise upload dropZone if public upload is allowedIchEben2014-03-071-1/+1
|/
* Merge pull request #7592 from owncloud/fixstoragefreespaceVincent Petry2014-03-062-499/+633
|\
| * Fixed upload issue when free space is not knownVincent Petry2014-03-061-1/+3
| * Added unit tests for "add()" method for file uploadVincent Petry2014-03-062-499/+631
* | Merge branch 'master' into fix-7307Thomas Müller2014-03-066-34/+73
|\|
| * Merge pull request #7575 from owncloud/issue/7571Vincent Petry2014-03-051-2/+2
| |\
| | * Do not set #dir when on public.phpJoas Schilling2014-03-051-2/+2
| * | Merge pull request #7531 from owncloud/dont_create_shared_folderBjörn Schießle2014-03-055-26/+61
| |\ \ | | |/ | |/|
| | * don't allow to create a file or folder named 'Shared' in the root folder, als...Bjoern Schiessle2014-03-055-26/+61
| * | Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-288-71/+126
| |\|
| * | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| * | adding share owner information to the file listThomas Müller2014-02-201-5/+5
* | | fixing download url in files appThomas Müller2014-03-021-1/+1
* | | Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-022-3/+5
| |/ |/|
* | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-31/+28
* | coding style fixes, cut long lines, comments not on same lines, curly bracesJan-Christoph Borchardt2014-02-261-8/+11
* | Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-244-17/+29
|\ \
| * | rename url parameterRobin Appelman2014-02-241-1/+1
| * | Add url parameter to control whether previews should return 404 when the mime...Robin Appelman2014-02-211-0/+1
| * | Make unit tests expect the svg iconsRobin Appelman2014-02-201-2/+6
| * | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-207-40/+105
| |\|
| * | Fix svg icons for public shares and external/shared filesRobin Appelman2014-02-191-3/+3
| * | Show svg mime icons when no preview is availableRobin Appelman2014-02-193-13/+20
* | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1Morris Jobke2014-02-241-2/+30
|\ \ \
| * | | code style: else on same lineJan-Christoph Borchardt2014-02-211-2/+1
| * | | fix intendationMorris Jobke2014-02-201-3/+3
| * | | Fixed trashbin titleVincent Petry2014-02-201-21/+15
| * | | Fixed title formatVincent Petry2014-02-201-1/+8
| * | | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa...Vincent Petry2014-02-201-3/+31
| |\ \ \ | | |_|/ | |/| |
| | * | Uses OC.basename instead of custom codeGuillaume AMAT2014-02-191-2/+2
| | * | Gets the page title from oc_defaults in Files appGuillaume AMAT2014-02-131-1/+1
| | * | Update page title when navigating through directoriesGuillaume AMAT2014-02-121-3/+31
* | | | fix too much distance between text and iconJan-Christoph Borchardt2014-02-211-1/+1
* | | | use SVG icons from icons.css for New file menuJan-Christoph Borchardt2014-02-212-13/+28
|/ / /
* | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-202-6/+12
|\ \ \
| * | | Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-182-6/+12