summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-062-0/+2
|
* prepare SQL query only once, that's what prepared statements are for. Should ↵Arthur Schiwon2012-11-051-2/+2
| | | | improve upgrade time with larger setups
* remove debug statementsRobin Appelman2012-11-051-2/+0
|
* this line shouldn't be hereRobin Appelman2012-11-041-1/+0
|
* some more code reuse for fileactionsRobin Appelman2012-11-041-16/+13
| | | | also fixes an issue where some fileactions always worked on the last file in the list
* Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-0410-14/+14
|
* Checkstyle fixes for SpaceBeforeOpenBraceFelix Moeller2012-11-043-3/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-046-1/+19
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-0335-0/+116
|
* Checkstyle: many fixesFelix Moeller2012-11-023-3/+3
|
* Fix a typoLukas Reschke2012-11-021-1/+1
|
* Add CSRF tokenLukas Reschke2012-11-022-1/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-0249-49/+0
|
* Files: change wording 'From url' to 'From link'Jan-Christoph Borchardt2012-11-011-1/+1
|
* adapted comments to the code changesBjörn Schießle2012-11-012-2/+2
|
* load logging apps for webdav connectionsBjörn Schießle2012-11-012-2/+3
| | | | Backport of de1b95c
* Merge pull request #155 from owncloud/token-expired-IEJörn Friedrich Dreyer2012-10-311-0/+2
|\ | | | | Send the requesttoken as form value
| * Change IE8 to "older IE versions"Lukas Reschke2012-10-301-1/+1
| | | | | | | | I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
| * Send the requesttoken as form valueLukas Reschke2012-10-301-0/+2
| | | | | | | | | | | | | | This is needed for IE < 8 because it doesn't send the CSRF token here. So that it is impossible to upload files. Fixes #110 and related to #122
* | Merge pull request #152 from scambra/webdav-quotaThomas Müller2012-10-311-0/+1
|\ \ | | | | | | checking quota in webdav
| * | fix checking quota in webdav, adding a sabredav pluginscambra2012-10-301-0/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-312-1/+20
|/ /
* | Merge pull request #142 from denis-b/patch-2blizzz2012-10-291-1/+1
|\ \ | | | | | | | | | fix moving (in) dirs containing "+"
| * | Update apps/files/ajax/move.phpdenis-b2012-10-291-1/+1
| |/ | | | | fix moving dirs containing "+"
* / Update apps/files/index.phpdenis-b2012-10-291-1/+1
|/ | | fix dirnames containing "+" not displayed
* Use files remote webdav in compatibility files/webdav.phpBart Visscher2012-10-291-2/+2
|
* Remove fixme, problem is solved alreadyBart Visscher2012-10-291-4/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-10-293-14/+28
|
* Fix shared status iconsMichael Gapczynski2012-10-281-1/+1
|
* properly replace fileaction icons with pngs when neededRobin Appelman2012-10-281-2/+2
|
* don't move file into subdirectory if a file with the same name already ↵Georg Ehrke2012-10-281-0/+5
| | | | exists (fixes #92)
* use css to show/hide fileactionsRobin Appelman2012-10-282-28/+10
|
* code styleRobin Appelman2012-10-281-93/+101
|
* Remove wrongly committed filesBart Visscher2012-10-272-180/+0
|
* Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-272-0/+180
|\ | | | | | | | | Conflicts: lib/base.php
| * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-172-0/+180
| |
* | Fix download url generationBart Visscher2012-10-271-1/+1
| |
* | Merge branch 'routing'Bart Visscher2012-10-274-4/+16
|\ \ | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
| * \ Merge branch 'master' into routingBart Visscher2012-10-1732-74/+503
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| * | | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-281-0/+12
| | | |
| * | | Merge branch 'master' into routingBart Visscher2012-09-281-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-2860-158/+613
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
| * \ \ \ \ Merge branch 'master' into routingBart Visscher2012-09-0747-171/+384
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php
| * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-3056-198/+118
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php
| * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2951-108/+356
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js
| * | | | | | | | Fix linkTo calls for new routingBart Visscher2012-08-153-4/+4
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-273-7/+35
| | | | | | | | |
* | | | | | | | | separate buttons for new file and uploadJan-Christoph Borchardt2012-10-261-6/+5
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-263-7/+22
| | | | | | | | |
* | | | | | | | | dir in newfile has to start with /Bart Visscher2012-10-251-1/+1
| | | | | | | | |