summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* merge master into webdav-injectionRobin Appelman2014-04-2579-280/+75
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2014-04-2537-65/+20
| * Merge pull request #8026 from owncloud/remove_shared_folderBjörn Schießle2014-04-248-143/+24
| |\
| | * always allow to rename the share mount pointBjoern Schiessle2014-04-232-1/+15
| | * we no longer need to handle the Shared folder different from any other folderBjoern Schiessle2014-04-237-140/+8
| | * don't overwrite shared folder iconBjoern Schiessle2014-04-231-2/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2412-2/+14
| * | Merge pull request #8233 from owncloud/fix-newdialog-ieThomas Müller2014-04-231-1/+1
| |\ \
| | * | fix shift of icons in 'New' menu in IE8/9, fix #7987Jan-Christoph Borchardt2014-04-161-1/+1
| * | | Adjust renaming of directories, fixes #8280Robin McCorkell2014-04-231-1/+2
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-04-2370-68/+14
* | | merge master into webdav-injectionRobin Appelman2014-04-229-79/+133
|\| |
| * | Merge pull request #8283 from owncloud/translatable-max-in-uploadJörn Friedrich Dreyer2014-04-222-2/+2
| |\ \
| | * | make max. text translatableVolkan Gezer2014-04-212-2/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-222-1/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-211-1/+1
| |/ /
| * | Merge pull request #8169 from owncloud/change-to-showAndreas Fischer2014-04-201-1/+1
| |\ \
| | * | Change from showHTML to showLukas Reschke2014-04-111-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-171-1/+1
| | |/ | |/|
| * | Merge pull request #8104 from owncloud/lukepolo-masterThomas Müller2014-04-154-74/+127
| |\ \ | | |/ | |/|
| | * add link to further discussion about that folder checkThomas Müller2014-04-151-0/+1
| | * fix single file upload in firefoxThomas Müller2014-04-101-1/+5
| | * In cases folder drag and drop is not supported a proper message is displayedThomas Müller2014-04-091-5/+12
| | * use FileList.findFileElThomas Müller2014-04-091-1/+2
| | * Merge branch 'master' into lukepolo-masterThomas Müller2014-04-096-23/+50
| | |\
| | * | js style fixes according to our jshintrc rulesThomas Müller2014-04-071-58/+56
| | * | fix folder upload in jsThomas Müller2014-04-071-16/+21
| | * | adding parentId to file info arrayThomas Müller2014-04-071-1/+2
| | * | remove unused exit()Thomas Müller2014-04-071-1/+0
| | * | Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-masterThomas Müller2014-04-073-13/+50
| | |\ \
| | | * | Fixed issue with drag and drop not in the root directory, for folders and filesLuke Policinski2014-02-201-6/+7
| | | * | Feature Added : Ability to drag and drop in ChromeLuke Policinski2014-02-192-8/+8
| | | * | Feature Added : Ability to drag and drop in ChromeLuke Policinski2014-02-193-13/+48
* | | | | merge master into webdav-injectionRobin Appelman2014-04-15101-1221/+2198
|\| | | |
| * | | | Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr...Björn Schießle2014-04-111-3/+3
| |\ \ \ \
| | * | | | Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-051-3/+3
| * | | | | Merge pull request #8076 from owncloud/enable-dav-browserLukas Reschke2014-04-101-0/+1
| |\ \ \ \ \
| | * | | | | Re-enable the sabredav browser pluginRobin Appelman2014-04-061-0/+1
| | |/ / / /
| * | | | / [tx-robot] updated from transifexJenkins for ownCloud2014-04-101-0/+2
| | |_|_|/ | |/| | |
| * | | | Merge pull request #8049 from owncloud/filepickersvgMorris Jobke2014-04-093-23/+10
| |\ \ \ \
| | * | | | Moved code to replace svg with png to OC.UtilVincent Petry2014-04-043-23/+10
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-091-0/+17
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-083-0/+23
| | |_|/ / | |/| | |
| * | | | Fix copy conflict dialog translationJörn Friedrich Dreyer2014-04-071-2/+2
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-062-1/+9
| | |/ / | |/| |
| * | | Show higher resolution previews for high dpi screensRobin Appelman2014-04-041-2/+4
| |/ /
| * | Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-041-2/+2
| |\ \
| | * | Allow reusing FileInfo for getStorageInfoRobin Appelman2014-04-021-2/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0470-224/+113
| * | | Merge pull request #6968 from owncloud/files-ajaxloadMorris Jobke2014-04-0320-914/+1880
| |\ \ \