Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 79 | -280/+75 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-25 | 37 | -65/+20 |
| * | Merge pull request #8026 from owncloud/remove_shared_folder | Björn Schießle | 2014-04-24 | 8 | -143/+24 |
| |\ | |||||
| | * | always allow to rename the share mount point | Bjoern Schiessle | 2014-04-23 | 2 | -1/+15 |
| | * | we no longer need to handle the Shared folder different from any other folder | Bjoern Schiessle | 2014-04-23 | 7 | -140/+8 |
| | * | don't overwrite shared folder icon | Bjoern Schiessle | 2014-04-23 | 1 | -2/+1 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-24 | 12 | -2/+14 |
| * | | Merge pull request #8233 from owncloud/fix-newdialog-ie | Thomas Müller | 2014-04-23 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | fix shift of icons in 'New' menu in IE8/9, fix #7987 | Jan-Christoph Borchardt | 2014-04-16 | 1 | -1/+1 |
| * | | | Adjust renaming of directories, fixes #8280 | Robin McCorkell | 2014-04-23 | 1 | -1/+2 |
| | |/ | |/| | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-23 | 70 | -68/+14 |
* | | | merge master into webdav-injection | Robin Appelman | 2014-04-22 | 9 | -79/+133 |
|\| | | |||||
| * | | Merge pull request #8283 from owncloud/translatable-max-in-upload | Jörn Friedrich Dreyer | 2014-04-22 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | make max. text translatable | Volkan Gezer | 2014-04-21 | 2 | -2/+2 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-22 | 2 | -1/+2 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-21 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #8169 from owncloud/change-to-show | Andreas Fischer | 2014-04-20 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Change from showHTML to show | Lukas Reschke | 2014-04-11 | 1 | -1/+1 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-17 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge pull request #8104 from owncloud/lukepolo-master | Thomas Müller | 2014-04-15 | 4 | -74/+127 |
| |\ \ | | |/ | |/| | |||||
| | * | add link to further discussion about that folder check | Thomas Müller | 2014-04-15 | 1 | -0/+1 |
| | * | fix single file upload in firefox | Thomas Müller | 2014-04-10 | 1 | -1/+5 |
| | * | In cases folder drag and drop is not supported a proper message is displayed | Thomas Müller | 2014-04-09 | 1 | -5/+12 |
| | * | use FileList.findFileEl | Thomas Müller | 2014-04-09 | 1 | -1/+2 |
| | * | Merge branch 'master' into lukepolo-master | Thomas Müller | 2014-04-09 | 6 | -23/+50 |
| | |\ | |||||
| | * | | js style fixes according to our jshintrc rules | Thomas Müller | 2014-04-07 | 1 | -58/+56 |
| | * | | fix folder upload in js | Thomas Müller | 2014-04-07 | 1 | -16/+21 |
| | * | | adding parentId to file info array | Thomas Müller | 2014-04-07 | 1 | -1/+2 |
| | * | | remove unused exit() | Thomas Müller | 2014-04-07 | 1 | -1/+0 |
| | * | | Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master | Thomas Müller | 2014-04-07 | 3 | -13/+50 |
| | |\ \ | |||||
| | | * | | Fixed issue with drag and drop not in the root directory, for folders and files | Luke Policinski | 2014-02-20 | 1 | -6/+7 |
| | | * | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 2 | -8/+8 |
| | | * | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 3 | -13/+48 |
* | | | | | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 101 | -1221/+2198 |
|\| | | | | |||||
| * | | | | Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr... | Björn Schießle | 2014-04-11 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Fix some localization issues with file encryption/decription strings | Volkan Gezer | 2014-04-05 | 1 | -3/+3 |
| * | | | | | Merge pull request #8076 from owncloud/enable-dav-browser | Lukas Reschke | 2014-04-10 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Re-enable the sabredav browser plugin | Robin Appelman | 2014-04-06 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-10 | 1 | -0/+2 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #8049 from owncloud/filepickersvg | Morris Jobke | 2014-04-09 | 3 | -23/+10 |
| |\ \ \ \ | |||||
| | * | | | | Moved code to replace svg with png to OC.Util | Vincent Petry | 2014-04-04 | 3 | -23/+10 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-09 | 1 | -0/+17 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-08 | 3 | -0/+23 |
| | |_|/ / | |/| | | | |||||
| * | | | | Fix copy conflict dialog translation | Jörn Friedrich Dreyer | 2014-04-07 | 1 | -2/+2 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-06 | 2 | -1/+9 |
| | |/ / | |/| | | |||||
| * | | | Show higher resolution previews for high dpi screens | Robin Appelman | 2014-04-04 | 1 | -2/+4 |
| |/ / | |||||
| * | | Merge pull request #8015 from owncloud/storageinfo-reuse | Vincent Petry | 2014-04-04 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Allow reusing FileInfo for getStorageInfo | Robin Appelman | 2014-04-02 | 1 | -2/+2 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-04 | 70 | -224/+113 |
| * | | | Merge pull request #6968 from owncloud/files-ajaxload | Morris Jobke | 2014-04-03 | 20 | -914/+1880 |
| |\ \ \ |