Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1512 from owncloud/mapped-filename-storage | icewind1991 | 2013-02-09 | 6 | -4/+614 |
|\ | |||||
| * | initial version of a local storage implementation which will use unique slugi... | Thomas Mueller | 2013-02-06 | 6 | -4/+614 |
* | | 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 #1545 from owncloud/fix-oc_webroot | Thomas Müller | 2013-02-09 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | fix-oc_webroot | Bart Visscher | 2013-02-08 | 1 | -1/+3 |
* | | | | Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers | Thomas Müller | 2013-02-09 | 1 | -60/+71 |
|\ \ \ \ | |||||
| * | | | | attach handlers to document instead of filelist, minor whitespace cleanups | Jörn Friedrich Dreyer | 2013-02-08 | 1 | -60/+71 |
* | | | | | 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 | 3 | -2/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Fix files router download links | Bart Visscher | 2013-02-08 | 3 | -2/+16 |
* | | | | | | 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 | 286 | -1173/+4498 |
* | | | | | | Merge pull request #1547 from owncloud/navigation-color | Thomas Müller | 2013-02-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | brighter grey for the navigation bar, hopefully solves the weird similarity t... | Jan-Christoph Borchardt | 2013-02-08 | 1 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #1548 from owncloud/installation-improvements | Thomas Müller | 2013-02-08 | 2 | -4/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | use proper HTML for other security warning too | Jan-Christoph Borchardt | 2013-02-08 | 1 | -3/+2 |
| * | | | | | improve and shorten security warning, add link to docs, fix #1342 | Jan-Christoph Borchardt | 2013-02-08 | 2 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master | Thomas Müller | 2013-02-08 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | quick fixing this require_once. | Thomas Mueller | 2013-02-08 | 1 | -1/+1 |
* | | | | | Merge pull request #1539 from owncloud/fixing-1508-master | Bart Visscher | 2013-02-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | missing comma in sql statement | Thomas Müller | 2013-02-08 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | 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 | 417 | -2774/+7832 |
* | | | | | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing | icewind1991 | 2013-02-07 | 1 | -4/+3 |
|\ \ \ \ \ | |||||
| * | | | | | simplyfy mimetype parsing of 'file' output | Jörn Friedrich Dreyer | 2013-02-07 | 1 | -4/+3 |
* | | | | | | Merge pull request #1514 from owncloud/fix-setup | Lukas Reschke | 2013-02-07 | 6 | -8/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fill oc_webroot with the expected value | Bart Visscher | 2013-02-07 | 1 | -0/+1 |
| * | | | | | | Fix disabling setup form on submit | Bart Visscher | 2013-02-07 | 1 | -5/+3 |
| * | | | | | | Define the variables that are expected to exist but won't be set in setup | Bart Visscher | 2013-02-07 | 1 | -0/+3 |
| * | | | | | | Move loading of js_config to templatelayout | Bart Visscher | 2013-02-07 | 4 | -3/+3 |
* | | | | | | | Merge pull request #1529 from owncloud/installation-login-fixes | Thomas Müller | 2013-02-07 | 3 | -28/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | make show password toggle work for installation (once #1525 is fixed) | Jan-Christoph Borchardt | 2013-02-07 | 2 | -4/+6 |
| * | | | | | | | make show password not specific to log in | Jan-Christoph Borchardt | 2013-02-07 | 2 | -7/+6 |
| * | | | | | | | remove duplicate show password toggle code, move current one to proper location | Jan-Christoph Borchardt | 2013-02-07 | 1 | -19/+11 |
| * | | | | | | | some comments for CSS documentation | Jan-Christoph Borchardt | 2013-02-07 | 1 | -3/+3 |
| * | | | | | | | fix database labels having left padding | Jan-Christoph Borchardt | 2013-02-07 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | 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 |
* | | | | | | | | Merge pull request #1526 from owncloud/l10n-support-master | Lukas Reschke | 2013-02-07 | 7 | -14/+25 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | |