Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-27 | 4 | -4/+16 |
|\ | |||||
| * | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 4 | -4/+16 |
| |\ | |||||
| | * | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 32 | -74/+503 |
| | |\ | |||||
| | * | | Implement route for download in OC_Search_Provider_File | Bart Visscher | 2012-09-28 | 1 | -0/+12 |
| | * | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 60 | -158/+613 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 47 | -171/+384 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 56 | -198/+118 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' into routing | Bart Visscher | 2012-08-29 | 51 | -108/+356 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix linkTo calls for new routing | Bart Visscher | 2012-08-15 | 3 | -4/+4 |
* | | | | | | | | | fix delete and sort files | Robin Appelman | 2012-10-27 | 3 | -11/+22 |
* | | | | | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-27 | 3 | -7/+35 |
|\| | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-27 | 3 | -7/+35 |
* | | | | | | | | | move some stuff to the new api | Robin Appelman | 2012-10-26 | 7 | -12/+13 |
* | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-26 | 1 | -6/+5 |
|\| | | | | | | | | |||||
| * | | | | | | | | separate buttons for new file and upload | Jan-Christoph Borchardt | 2012-10-26 | 1 | -6/+5 |
* | | | | | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-26 | 3 | -7/+22 |
|\| | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-26 | 3 | -7/+22 |
* | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-25 | 4 | -5/+5 |
|\| | | | | | | | | |||||
| * | | | | | | | | dir in newfile has to start with / | Bart Visscher | 2012-10-25 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #81 from fmms/master | Lukas Reschke | 2012-10-24 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Checkstyle: NoSpaceAfterComma | Felix Moeller | 2012-10-23 | 1 | -2/+2 |
| * | | | | | | | | | Revert e1a4fe98908dbf8f9e795fd852b231381d4f3ce4 | Lukas Reschke | 2012-10-24 | 1 | -1/+1 |
| * | | | | | | | | | urldecode target directory | Björn Schießle | 2012-10-24 | 1 | -1/+1 |
* | | | | | | | | | | cleanup OC_Files a bit | Robin Appelman | 2012-10-24 | 5 | -20/+34 |
* | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-24 | 6 | -25/+53 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #76 from fmms/master | Lukas Reschke | 2012-10-23 | 1 | -1/+1 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Codestyle: FunctionCallArgumentSpacing | Felix Moeller | 2012-10-23 | 1 | -1/+1 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-24 | 2 | -21/+49 |
| * | | | | | | | | | Fix urlencoding in the breadcrumb | Lukas Reschke | 2012-10-23 | 1 | -1/+1 |
| * | | | | | | | | | Merge pull request #62 from fmms/master | Lukas Reschke | 2012-10-23 | 2 | -2/+2 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Make Jenkins more happy. | Felix Moeller | 2012-10-23 | 2 | -2/+2 |
* | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-23 | 10 | -8/+196 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #12 from scambra/fixes | icewind1991 | 2012-10-23 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | check free space using folder's owner | scambra | 2012-09-19 | 2 | -2/+2 |
| * | | | | | | | | | | Files: urldecode urlencoded dir names, fixes oc-2111 | Arthur Schiwon | 2012-10-23 | 1 | -1/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-23 | 6 | -3/+175 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-22 | 2 | -0/+16 |
* | | | | | | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-21 | 2 | -0/+43 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-21 | 2 | -0/+43 |
* | | | | | | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-20 | 31 | -105/+238 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-20 | 14 | -18/+130 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-19 | 30 | -88/+109 |
* | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-18 | 51 | -473/+29 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #39 from scambra/date-l10n-fixes | Thomas Müller | 2012-10-18 | 1 | -5/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Translate modification date when file is created/uploaded, use same strings a... | scambra | 2012-10-16 | 1 | -5/+4 |
| * | | | | | | | | | | fix oc-605 | Jörn Friedrich Dreyer | 2012-10-18 | 2 | -9/+11 |
| * | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-18 | 48 | -445/+0 |
| * | | | | | | | | | | Merge pull request #37 from scambra/js-interpolation-l10n | Thomas Müller | 2012-10-17 | 2 | -14/+14 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| | * | | | | | | | | | use interpolation for some translations in js | scambra | 2012-10-16 | 2 | -14/+14 |
| | |/ / / / / / / / |