Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 73 | -429/+456 |
|\ | |||||
| * | fix merge conflict | Björn Schießle | 2013-01-31 | 70 | -358/+438 |
| |\ | |||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-31 | 48 | -199/+9 |
| | * | merge master into filesystem | Robin Appelman | 2013-01-30 | 15 | -29/+166 |
| | |\ | |||||
| | | * | 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 | 2 | -5/+5 |
| | | * | add multselect dnd | Jörn Friedrich Dreyer | 2013-01-30 | 2 | -21/+119 |
| | * | | Files: Dont get maxUploadSize if the filecache needs to be upgraded | Robin Appelman | 2013-01-30 | 1 | -3/+2 |
| | * | | Files: fix sharing newly uploaded files | Robin Appelman | 2013-01-28 | 1 | -17/+20 |
| | * | | change required ownCloud version to 4.91 | Robin Appelman | 2013-01-28 | 1 | -1/+1 |
| | * | | merge master into filesystem | Robin Appelman | 2013-01-28 | 7 | -36/+6 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2013-01-28 | 58 | -87/+99 |
| | |\ \ \ | |||||
| | * \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-26 | 25 | -124/+183 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2013-01-22 | 9 | -0/+18 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Files: don't load fileactions.js when upgrading filecache | Robin Appelman | 2013-01-21 | 1 | -1/+1 |
| | * | | | | | | merge master into filesytem | Robin Appelman | 2013-01-20 | 65 | -179/+223 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Files: make sure keybinds js is loaded after files js | Robin Appelman | 2013-01-16 | 1 | -1/+1 |
| | * | | | | | | | merge master into filesystem | Robin Appelman | 2013-01-16 | 5 | -10/+17 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Cache: more efficient upgrading | Robin Appelman | 2013-01-15 | 1 | -0/+2 |
| | * | | | | | | | | Cache: show upgrade progress | Robin Appelman | 2013-01-15 | 6 | -39/+115 |
| | * | | | | | | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 55 | -222/+416 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-07 | 46 | -9/+87 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2013-01-03 | 11 | -34/+195 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-25 | 13 | -99/+138 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-15 | 8 | -15/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-12-11 | 9 | -93/+278 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-06 | 8 | -1/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-03 | 4 | -1/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-12-02 | 65 | -223/+231 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | add upgrade path from old cache to preserve file id's | Robin Appelman | 2012-11-30 | 2 | -3/+13 |
| | * | | | | | | | | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-11-30 | 20 | -5/+60 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-11-25 | 53 | -51/+34 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Add checks for storage object | Michael Gapczynski | 2012-11-24 | 1 | -7/+8 |
| | * | | | | | | | | | | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-11-23 | 6 | -19/+42 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-23 | 4 | -1/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | use background scanner | Robin Appelman | 2012-11-23 | 2 | -55/+72 |
| | * | | | | | | | | | | | | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-11-21 | 6 | -15/+76 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-18 | 4 | -6/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-11-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-15 | 57 | -19/+151 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fix undefined index when loading files app | Robin Appelman | 2012-11-08 | 2 | -4/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fix rename parameter order | Robin Appelman | 2012-11-08 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-11-08 | 44 | -401/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-07 | 6 | -40/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-04 | 48 | -14/+148 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-11-02 | 52 | -51/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-11-01 | 5 | -5/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master into filesystem | Robin Appelman | 2012-10-30 | 9 | -136/+137 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |