Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into from-insane-autoescape-to-p | Thomas Mueller | 2013-03-01 | 1 | -0/+1 |
|\ | |||||
| * | fixes #2001 - in case the user has no permissions to upload/create files/fold... | Thomas Mueller | 2013-03-01 | 1 | -1/+2 |
* | | [Files] Use p() instead of echo | Lukas Reschke | 2013-02-27 | 1 | -2/+1 |
* | | Merge master | Lukas Reschke | 2013-02-27 | 1 | -2/+2 |
|\| | |||||
| * | Update apps/files/templates/part.list.php | j-ed | 2013-02-27 | 1 | -2/+2 |
* | | [files] Unescape file size | Lukas Reschke | 2013-02-27 | 1 | -1/+1 |
* | | [Files] Use htmlspecialchars() | Lukas Reschke | 2013-02-27 | 1 | -2/+2 |
* | | [Files] Use p() instead of echo | Lukas Reschke | 2013-02-27 | 5 | -75/+75 |
|/ | |||||
* | Merge pull request #1662 from owncloud/style-cleanup | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
|\ | |||||
| * | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 1 | -1/+1 |
* | | call 'Trash bin' 'Deleted files' | Björn Schießle | 2013-02-14 | 1 | -1/+1 |
|/ | |||||
* | svg replacement for breadcrumb home icon, fix #1620 | Jan-Christoph Borchardt | 2013-02-11 | 1 | -1/+1 |
* | Merge pull request #1551 from owncloud/fix_files_multiselect | Jörn Friedrich Dreyer | 2013-02-10 | 1 | -1/+1 |
|\ | |||||
| * | Remove hascontrols - use original positioning. | Thomas Tanghus | 2013-02-09 | 1 | -1/+1 |
* | | rename trash to trash bin | Björn Schießle | 2013-02-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 1 | -1/+1 |
|\ | |||||
| * | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 1 | -9/+9 |
| * | Files: fix positioning of Trash button and upload progress bar | Robin Appelman | 2013-02-04 | 1 | -8/+8 |
* | | Remove undefined crumb variable from home breadcrumb | Michael Gapczynski | 2013-02-04 | 1 | -1/+1 |
* | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master | Thomas Müller | 2013-02-03 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into fixing-js-errors-public-link-master | Thomas Mueller | 2013-01-31 | 3 | -3/+11 |
| |\ | |||||
| * | | fixing href for folders | Thomas Mueller | 2013-01-28 | 1 | -1/+1 |
* | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 3 | -4/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | fix merge conflict | Björn Schießle | 2013-01-31 | 2 | -3/+7 |
| |\ \ | |||||
| | * | | merge master into filesystem | Robin Appelman | 2013-01-28 | 1 | -1/+1 |
| | |\| | |||||
| | * | | merge master into filesystem | Robin Appelman | 2013-01-26 | 2 | -8/+2 |
| | |\ \ | |||||
| | * | | | Cache: show upgrade progress | Robin Appelman | 2013-01-15 | 1 | -0/+4 |
| | * | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 3 | -83/+81 |
| | |\ \ \ | |||||
| | * \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-03 | 2 | -3/+7 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-25 | 2 | -4/+4 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-12-11 | 1 | -13/+14 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-02 | 4 | -39/+104 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-23 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | fix undefined index when loading files app | Robin Appelman | 2012-11-08 | 1 | -1/+1 |
| * | | | | | | | | | | | fix merge conflicts | Björn Schießle | 2013-01-28 | 2 | -8/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | rename "publicListView" option to "disableSharing", this is more meaningful a... | Björn Schießle | 2013-01-22 | 1 | -3/+3 |
| * | | | | | | | | | | | add trash button to web interface | Björn Schießle | 2013-01-22 | 1 | -1/+5 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | merge styles | Jan-Christoph Borchardt | 2013-01-28 | 2 | -8/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Use HTML5 data attribute + fix undefined variable | Lukas Reschke | 2013-01-26 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 2 | -78/+78 |
| | |\| | | | | | | | | |||||
| | * | | | | | | | | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 1 | -1/+0 |
| | * | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 1 | -5/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | make usedSpacePercent available in the files app | Thomas Mueller | 2013-01-02 | 1 | -0/+1 |
| * | | | | | | | | | | | No inline JS in apps | Lukas Reschke | 2013-01-21 | 1 | -7/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | More Style Fixes | raghunayyar | 2013-01-25 | 1 | -2/+1 |
* | | | | | | | | | | | merge master into navigation | Jan-Christoph Borchardt | 2013-01-15 | 4 | -88/+90 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Remove ugly indentation | Lukas Reschke | 2013-01-13 | 2 | -78/+78 |
| | |_|/ / / / / / / | |/| | | | | | | | |