Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | attach max upload tipsy to div instead of a to fix tooltip not showing due to... | Jörn Friedrich Dreyer | 2013-01-07 | 1 | -3/+3 |
| * | | | | | | | | | Merge branch 'master' into fix_minor_files_annoyances | Thomas Mueller | 2013-01-06 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge pull request #1041 from owncloud/fixing-856-master | Thomas Müller | 2013-01-02 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | only show the max possible upload of 2GB on a 32 bit system. | Thomas Mueller | 2012-12-28 | 1 | -1/+4 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| * | / | | | | | | remove initial iframe, is added automatically by jquery upload mechanism | Jörn Friedrich Dreyer | 2013-01-04 | 1 | -2/+0 |
| |/ / / / / / / | |||||
| * / / / / / / | Replace %2F with / in breadcrumbs | Michael Gapczynski | 2012-12-28 | 1 | -2/+3 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #869 from owncloud/files-styles | Jan-Christoph Borchardt | 2012-12-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix new button popup looking blurry | Jan-Christoph Borchardt | 2012-12-13 | 1 | -1/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * / | | | | | cleaning up the settings. standardize the format, add missing I10N and other ... | Frank Karlitschek | 2012-12-15 | 1 | -3/+3 |
| |/ / / / / | |||||
* | | | | | | merge master into navigation | Jan-Christoph Borchardt | 2012-12-18 | 4 | -54/+121 |
|\| | | | | | |||||
| * | | | | | fix svg -> png replacement for android, cleanup and remove obsolete css | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -5/+3 |
| * | | | | | add IE9 CSS checkbox fixes | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -1/+1 |
| * | | | | | upload button HTML, CSS & JS cleanup | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -4/+5 |
| * | | | | | fix_new_and_upload_button_html_css | Jörn Friedrich Dreyer | 2012-12-07 | 1 | -8/+10 |
| | |_|_|/ | |/| | | | |||||
| * | | | | fix checkstyle for files app | Jörn Friedrich Dreyer | 2012-11-29 | 4 | -39/+104 |
| | |_|/ | |/| | | |||||
| * | | | Do the url encoding once, only in breadcrumbs template | Bart Visscher | 2012-11-16 | 1 | -3/+4 |
| | |/ | |/| | |||||
| * | | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* | Thomas Tanghus | 2012-11-11 | 1 | -1/+1 |
| |/ | |||||
| * | Checkstyle fixes: NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 4 | -7/+7 |
* | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-11-02 | 2 | -1/+2 |
|\| | |||||
| * | Add CSRF token | Lukas Reschke | 2012-11-02 | 1 | -0/+1 |
| * | Files: change wording 'From url' to 'From link' | Jan-Christoph Borchardt | 2012-11-01 | 1 | -1/+1 |
* | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2012-11-01 | 1 | -0/+2 |
|\| |