summaryrefslogtreecommitdiffstats
path: root/apps/files/templates
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1662 from owncloud/style-cleanupBart Visscher2013-02-141-1/+1
|\
| * Fix NoSpaceAfterComma and SpaceBeforeCommaBart Visscher2013-02-141-1/+1
* | call 'Trash bin' 'Deleted files'Björn Schießle2013-02-141-1/+1
|/
* svg replacement for breadcrumb home icon, fix #1620Jan-Christoph Borchardt2013-02-111-1/+1
* Merge pull request #1551 from owncloud/fix_files_multiselectJörn Friedrich Dreyer2013-02-101-1/+1
|\
| * Remove hascontrols - use original positioning.Thomas Tanghus2013-02-091-1/+1
* | rename trash to trash binBjörn Schießle2013-02-091-1/+1
|/
* Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-061-1/+1
|\
| * Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-041-9/+9
| * Files: fix positioning of Trash button and upload progress barRobin Appelman2013-02-041-8/+8
* | Remove undefined crumb variable from home breadcrumbMichael Gapczynski2013-02-041-1/+1
* | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-031-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' into fixing-js-errors-public-link-masterThomas Mueller2013-01-313-3/+11
| |\
| * | fixing href for foldersThomas Mueller2013-01-281-1/+1
* | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-313-4/+12
|\ \ \ | | |/ | |/|
| * | fix merge conflictBjörn Schießle2013-01-312-3/+7
| |\ \
| | * | merge master into filesystemRobin Appelman2013-01-281-1/+1
| | |\|
| | * | merge master into filesystemRobin Appelman2013-01-262-8/+2
| | |\ \
| | * | | Cache: show upgrade progressRobin Appelman2013-01-151-0/+4
| | * | | merge master into filesystemRobin Appelman2013-01-153-83/+81
| | |\ \ \
| | * \ \ \ merge master into filesystemRobin Appelman2013-01-032-3/+7
| | |\ \ \ \
| | * \ \ \ \ merge master into filesystemRobin Appelman2012-12-252-4/+4
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-12-111-13/+14
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-024-39/+104
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-231-3/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-151-1/+1
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fix undefined index when loading files appRobin Appelman2012-11-081-1/+1
| * | | | | | | | | | | fix merge conflictsBjörn Schießle2013-01-282-8/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | rename "publicListView" option to "disableSharing", this is more meaningful a...Björn Schießle2013-01-221-3/+3
| * | | | | | | | | | | add trash button to web interfaceBjörn Schießle2013-01-221-1/+5
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | merge stylesJan-Christoph Borchardt2013-01-282-8/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-261-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-182-78/+78
| | |\| | | | | | | |
| | * | | | | | | | | displaying notification now centeredThomas Mueller2013-01-111-1/+0
| | * | | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-111-5/+3
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-061-1/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | make usedSpacePercent available in the files appThomas Mueller2013-01-021-0/+1
| * | | | | | | | | | | No inline JS in appsLukas Reschke2013-01-211-7/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | More Style Fixesraghunayyar2013-01-251-2/+1
* | | | | | | | | | | merge master into navigationJan-Christoph Borchardt2013-01-154-88/+90
|\| | | | | | | | | |
| * | | | | | | | | | Remove ugly indentationLukas Reschke2013-01-132-78/+78
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | attach max upload tipsy to div instead of a to fix tooltip not showing due to...Jörn Friedrich Dreyer2013-01-071-3/+3
| * | | | | | | | | Merge branch 'master' into fix_minor_files_annoyancesThomas Mueller2013-01-061-1/+4
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #1041 from owncloud/fixing-856-masterThomas Müller2013-01-021-1/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | only show the max possible upload of 2GB on a 32 bit system.Thomas Mueller2012-12-281-1/+4
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | / | | | | | remove initial iframe, is added automatically by jquery upload mechanismJörn Friedrich Dreyer2013-01-041-2/+0
| |/ / / / / / /
| * / / / / / / Replace %2F with / in breadcrumbsMichael Gapczynski2012-12-281-2/+3
| |/ / / / / /
| * | | | | | Merge pull request #869 from owncloud/files-stylesJan-Christoph Borchardt2012-12-201-1/+1
| |\ \ \ \ \ \
| | * | | | | | fix new button popup looking blurryJan-Christoph Borchardt2012-12-131-1/+1
| | | |_|_|_|/ | | |/| | | |