Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | extract common code | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -43/+88 |
* | Merge pull request #1565 from owncloud/fix_replacing | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -3/+0 |
|\ | |||||
| * | remove code properly | Georg Ehrke | 2013-02-09 | 1 | -3/+0 |
* | | Merge pull request #1560 from owncloud/fix_replacing | Bernhard Posselt | 2013-02-09 | 1 | -2/+2 |
|\| | |||||
| * | remove (comment out) old code to fix replacing of files | Georg Ehrke | 2013-02-09 | 1 | -2/+2 |
* | | Merge pull request #1562 from schiesbn/fix_naming | Bernhard Posselt | 2013-02-09 | 1 | -1/+1 |
|\ \ | |||||
| * | | rename trash to trash bin | Björn Schießle | 2013-02-09 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1521 from schiesbn/label_fixed | Björn Schießle | 2013-02-09 | 1 | -4/+1 |
|\ \ | |/ |/| | |||||
| * | don't call the delete button unshare, unshare operation no longer available | Björn Schießle | 2013-02-07 | 1 | -4/+1 |
* | | Merge pull request #1550 from owncloud/fix-files-download-links | Jörn Friedrich Dreyer | 2013-02-09 | 2 | -2/+2 |
|\ \ | |||||
| * | | Fix files router download links | Bart Visscher | 2013-02-08 | 2 | -2/+2 |
* | | | Merge pull request #1541 from owncloud/fixing-1540-master | Jörn Friedrich Dreyer | 2013-02-09 | 2 | -8/+0 |
|\ \ \ | |||||
| * | | | remove unused code | Thomas Müller | 2013-02-08 | 1 | -6/+0 |
| * | | | remove undefined function FileList.finishDelete | Thomas Müller | 2013-02-08 | 1 | -2/+0 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-09 | 33 | -33/+9 |
|/ / | |||||
* | | Merge pull request #1534 from owncloud/files_l10n | Thomas Müller | 2013-02-08 | 3 | -6/+10 |
|\ \ | |||||
| * | | Files: explicitly define | Robin Appelman | 2013-02-08 | 2 | -0/+4 |
| * | | Files: rename 'space' to 'storage' in upload.php | Robin Appelman | 2013-02-07 | 1 | -1/+1 |
| * | | Files: add translation support back to move/rename | Robin Appelman | 2013-02-07 | 2 | -5/+5 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-08 | 10 | -1/+22 |
* | | Merge pull request #1507 from tripflex/master | Bart Visscher | 2013-02-07 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Remove left float from actions div class | Myles McNamara | 2013-02-06 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-07 | 2 | -2/+11 |
* | | Merge pull request #1498 from schiesbn/delete_trash | Lukas Reschke | 2013-02-06 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | allow to delete single files from the trash bin permanently | Björn Schießle | 2013-02-06 | 1 | -0/+2 |
* | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 2 | -5/+5 |
|\ \ | |/ |/| | |||||
| * | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 2 | -11/+11 |
| * | Files: fix positioning of Trash button and upload progress bar | Robin Appelman | 2013-02-04 | 2 | -10/+10 |
| * | Fix leftcontent positioning. Ref #1255 | Thomas Tanghus | 2013-02-03 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-06 | 1 | -1/+6 |
* | | Remove undefined crumb variable from home breadcrumb | Michael Gapczynski | 2013-02-04 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-05 | 1 | -1/+4 |
* | | Merge pull request #1229 from owncloud/from_live_to_on | Thomas Müller | 2013-02-03 | 2 | -7/+7 |
|\ \ | |||||
| * \ | Merge branch 'master' into from_live_to_on | Thomas Mueller | 2013-01-31 | 75 | -526/+521 |
| |\ \ | |||||
| * | | | attach on to filelist instead of individual td elements for file link behaviour | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -1/+1 |
| * | | | replace live() with on() in core js | Jörn Friedrich Dreyer | 2013-01-30 | 2 | -7/+7 |
* | | | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master | Thomas Müller | 2013-02-03 | 2 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500 | Thomas Mueller | 2013-01-31 | 1 | -0/+4 |
| * | | | | Merge branch 'master' into fixing-js-errors-public-link-master | Thomas Mueller | 2013-01-31 | 75 | -516/+554 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | call ajax scan only if a user is logged in - otherwise we'll get a 500 | Thomas Mueller | 2013-01-28 | 1 | -5/+7 |
| * | | | | fixing href for folders | Thomas Mueller | 2013-01-28 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-04 | 3 | -30/+65 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1422 from TheSFReader/master | Thomas Müller | 2013-02-03 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-02 | 6 | -8/+25 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-02-01 | 9 | -10/+25 |
| |\ \ \ \ \ | |||||
| * | | | | | | Correct it | TheSFReader | 2013-02-01 | 1 | -1/+2 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-03 | 2 | -1/+6 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-02 | 6 | -8/+25 |
| |/ / / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-01 | 4 | -2/+12 |
* | | | | | Merge pull request #1351 from owncloud/navigation | Michael Gapczynski | 2013-01-31 | 3 | -7/+10 |
|\ \ \ \ \ | |_|_|/ / |/| | | | |