summaryrefslogtreecommitdiffstats
path: root/apps/files/templates
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |_|_|_|/ | | |/| | | |
| * / | | | | cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-151-3/+3
| |/ / / / /
* | | | | | merge master into navigationJan-Christoph Borchardt2012-12-184-54/+121
|\| | | | |
| * | | | | fix svg -> png replacement for android, cleanup and remove obsolete cssJörn Friedrich Dreyer2012-12-071-5/+3
| * | | | | add IE9 CSS checkbox fixesJörn Friedrich Dreyer2012-12-071-1/+1
| * | | | | upload button HTML, CSS & JS cleanupJörn Friedrich Dreyer2012-12-071-4/+5
| * | | | | fix_new_and_upload_button_html_cssJörn Friedrich Dreyer2012-12-071-8/+10
| | |_|_|/ | |/| | |
| * | | | fix checkstyle for files appJörn Friedrich Dreyer2012-11-294-39/+104
| | |_|/ | |/| |
| * | | Do the url encoding once, only in breadcrumbs templateBart Visscher2012-11-161-3/+4
| | |/ | |/|
| * | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*Thomas Tanghus2012-11-111-1/+1
| |/
| * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-044-7/+7
* | Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-022-1/+2
|\|
| * Add CSRF tokenLukas Reschke2012-11-021-0/+1
| * Files: change wording 'From url' to 'From link'Jan-Christoph Borchardt2012-11-011-1/+1
* | Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-011-0/+2
|\|