Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflict | Björn Schießle | 2013-01-31 | 2 | -46/+141 |
|\ | |||||
| * | merge master into filesystem | Robin Appelman | 2013-01-30 | 1 | -23/+109 |
| |\ | |||||
| | * | use $.trim() for IE8 | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -2/+2 |
| | * | reset checkbox after getting selected files instead of ofter dragging, speed ... | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -18/+13 |
| | * | use post instead of get | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -2/+2 |
| | * | add multselect dnd | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -21/+108 |
| | * | Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10 | Thomas Müller | 2013-01-30 | 1 | -0/+4 |
| | |\ | |||||
| | | * | hide upload progress bar and cancel action in IE < 10 | Jörn Friedrich Dreyer | 2013-01-18 | 1 | -0/+4 |
| * | | | merge master into filesystem | Robin Appelman | 2013-01-28 | 1 | -20/+0 |
| |\| | | |||||
| * | | | merge master into filesystem | Robin Appelman | 2013-01-26 | 3 | -51/+77 |
| |\ \ \ | |||||
| * \ \ \ | merge master into filesytem | Robin Appelman | 2013-01-20 | 2 | -1/+81 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-16 | 2 | -8/+8 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Cache: show upgrade progress | Robin Appelman | 2013-01-15 | 1 | -0/+17 |
| * | | | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 2 | -45/+68 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-07 | 2 | -5/+17 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-25 | 3 | -25/+14 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-15 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-12-11 | 3 | -22/+174 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-23 | 3 | -14/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-23 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | use background scanner | Robin Appelman | 2012-11-23 | 1 | -23/+15 |
* | | | | | | | | | | | | | | make spinner title translatable | Björn Schießle | 2013-01-30 | 1 | -1/+1 |
* | | | | | | | | | | | | | | show a spinner instead of the delete button while moving files to the trash bin | Björn Schießle | 2013-01-30 | 1 | -3/+15 |
* | | | | | | | | | | | | | | icons added; empty trash bin message added | Björn Schießle | 2013-01-29 | 1 | -1/+1 |
* | | | | | | | | | | | | | | merge conflict fixed | Björn Schießle | 2013-01-28 | 1 | -43/+0 |
* | | | | | | | | | | | | | | fix merge conflicts | Björn Schießle | 2013-01-28 | 2 | -47/+97 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Use HTML5 data attribute + fix undefined variable | Lukas Reschke | 2013-01-26 | 1 | -20/+0 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 2 | -51/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | replace #notification with OC.Notification call | Thomas Mueller | 2013-01-19 | 1 | -2/+1 |
| | * | | | | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | update used space percent after each ajax call and display the notification | Thomas Mueller | 2013-01-19 | 1 | -2/+10 |
| | * | | | | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 3 | -26/+107 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | fixing indent - sorryy wrong setting on the IDE :-( | Thomas Mueller | 2013-01-11 | 1 | -17/+15 |
| | * | | | | | | | | | | | | | adding accidentally removed line - THX @bartv2 | Thomas Mueller | 2013-01-11 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 2 | -41/+64 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 2 | -5/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | javascript notification functions have been moved to js.js for common use | Thomas Mueller | 2013-01-04 | 2 | -43/+22 |
| | * | | | | | | | | | | | | | | notifications are now shown/hidden using the js functions hideNotification an... | Thomas Mueller | 2013-01-02 | 2 | -38/+60 |
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | rename 'publicListView' switch to 'disableSharing' because this is not only u... | Björn Schießle | 2013-01-22 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | Remove closing tag | Lukas Reschke | 2013-01-21 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | No inline JS in apps | Lukas Reschke | 2013-01-21 | 1 | -0/+21 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | no undo notification for deleted file, we use the trash bin instead | Björn Schießle | 2013-01-22 | 1 | -54/+15 |
* | | | | | | | | | | | | | | allow to look into deleted directories | Björn Schießle | 2013-01-22 | 1 | -0/+1 |
* | | | | | | | | | | | | | | introduce option to disable download action | Björn Schießle | 2013-01-22 | 1 | -6/+10 |
* | | | | | | | | | | | | | | call the trash bin view | Björn Schießle | 2013-01-22 | 1 | -2/+2 |
* | | | | | | | | | | | | | | add trash button to web interface | Björn Schießle | 2013-01-22 | 1 | -0/+5 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #1228 from owncloud/generating_zip_message | Jan-Christoph Borchardt | 2013-01-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change the second part of the notification | Lukas Reschke | 2013-01-19 | 1 | -1/+1 |
| * | | | | | | | | | | | | Make the message friendlier | Lukas Reschke | 2013-01-18 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |