summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Just a little cleaner in touchHenrik Kjölhede2013-02-091-1/+1
* Update to touchHenrik Kjölhede2013-02-091-1/+5
* Spelling mistakeHenrik Kjölhede2013-02-091-1/+1
* Added unittestHenrik Kjölhede2013-02-091-0/+7
* Update to conform to API changesHenrik Kjölhede2013-02-091-3/+4
* corrected namespaceHenrik Kjölhede2013-02-091-2/+1
* Merge branch 'master' of https://github.com/hkjolhede/owncloud_coreHenrik Kjölhede2013-02-091-2/+1
|\
| * Update lib/filestorage/common.phphkjolhede2013-01-271-2/+1
* | Modified to new class structureHenrik Kjölhede2013-02-091-1/+3
* | Deleted phpseclib/testsHenrik Kjölhede2013-02-094-375/+0
* | Merge branch 'master' of https://github.com/owncloud/coreHenrik Kjölhede2013-02-091174-33898/+64400
|\ \ | |/ |/|
| * Merge pull request #1512 from owncloud/mapped-filename-storageicewind19912013-02-096-4/+614
| |\
| | * initial version of a local storage implementation which will use unique slugi...Thomas Mueller2013-02-066-4/+614
| * | Merge pull request #1565 from owncloud/fix_replacingJörn Friedrich Dreyer2013-02-091-3/+0
| |\ \
| | * | remove code properlyGeorg Ehrke2013-02-091-3/+0
| * | | Merge pull request #1560 from owncloud/fix_replacingBernhard Posselt2013-02-091-2/+2
| |\| |
| | * | remove (comment out) old code to fix replacing of filesGeorg Ehrke2013-02-091-2/+2
| * | | Merge pull request #1545 from owncloud/fix-oc_webrootThomas Müller2013-02-091-1/+3
| |\ \ \
| | * | | fix-oc_webrootBart Visscher2013-02-081-1/+3
| * | | | Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlersThomas Müller2013-02-091-60/+71
| |\ \ \ \
| | * | | | attach handlers to document instead of filelist, minor whitespace cleanupsJörn Friedrich Dreyer2013-02-081-60/+71
| * | | | | Merge pull request #1562 from schiesbn/fix_namingBernhard Posselt2013-02-091-1/+1
| |\ \ \ \ \
| | * | | | | rename trash to trash binBjörn Schießle2013-02-091-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #1521 from schiesbn/label_fixedBjörn Schießle2013-02-091-4/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | don't call the delete button unshare, unshare operation no longer availableBjörn Schießle2013-02-071-4/+1
| * | | | | Merge pull request #1550 from owncloud/fix-files-download-linksJörn Friedrich Dreyer2013-02-093-2/+16
| |\ \ \ \ \
| | * | | | | Fix files router download linksBart Visscher2013-02-083-2/+16
| * | | | | | Merge pull request #1541 from owncloud/fixing-1540-masterJörn Friedrich Dreyer2013-02-092-8/+0
| |\ \ \ \ \ \
| | * | | | | | remove unused codeThomas Müller2013-02-081-6/+0
| | * | | | | | remove undefined function FileList.finishDeleteThomas Müller2013-02-081-2/+0
| | | |_|_|/ / | | |/| | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-09286-1173/+4498
| * | | | | | Merge pull request #1547 from owncloud/navigation-colorThomas Müller2013-02-081-2/+2
| |\ \ \ \ \ \
| | * | | | | | brighter grey for the navigation bar, hopefully solves the weird similarity t...Jan-Christoph Borchardt2013-02-081-2/+2
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #1548 from owncloud/installation-improvementsThomas Müller2013-02-082-4/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | use proper HTML for other security warning tooJan-Christoph Borchardt2013-02-081-3/+2
| | * | | | | improve and shorten security warning, add link to docs, fix #1342Jan-Christoph Borchardt2013-02-082-1/+3
| | |/ / / /
| * | | | | Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-masterThomas Müller2013-02-081-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | quick fixing this require_once.Thomas Mueller2013-02-081-1/+1
| * | | | | Merge pull request #1539 from owncloud/fixing-1508-masterBart Visscher2013-02-081-1/+1
| |\ \ \ \ \
| | * | | | | missing comma in sql statementThomas Müller2013-02-081-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #1534 from owncloud/files_l10nThomas Müller2013-02-083-6/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Files: explicitly defineRobin Appelman2013-02-082-0/+4
| | * | | | Files: rename 'space' to 'storage' in upload.phpRobin Appelman2013-02-071-1/+1
| | * | | | Files: add translation support back to move/renameRobin Appelman2013-02-072-5/+5
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-08417-2774/+7832
| * | | | | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsingicewind19912013-02-071-4/+3
| |\ \ \ \ \
| | * | | | | simplyfy mimetype parsing of 'file' outputJörn Friedrich Dreyer2013-02-071-4/+3
| * | | | | | Merge pull request #1514 from owncloud/fix-setupLukas Reschke2013-02-076-8/+10
| |\ \ \ \ \ \
| | * | | | | | Fill oc_webroot with the expected valueBart Visscher2013-02-071-0/+1
| | * | | | | | Fix disabling setup form on submitBart Visscher2013-02-071-5/+3