Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-16 | 422 | -6391/+6408 |
| | |||||
* | Merge pull request #8104 from owncloud/lukepolo-master | Thomas Müller | 2014-04-15 | 6 | -75/+145 |
|\ | | | | | Added the ability to Drag and Drop folders [chrome] | ||||
| * | add link to further discussion about that folder check | Thomas Müller | 2014-04-15 | 1 | -0/+1 |
| | | |||||
| * | drop folder support on public shared folders | Thomas Müller | 2014-04-11 | 1 | -1/+7 |
| | | |||||
| * | 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 | 564 | -8251/+20628 |
| |\ | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| * | | js style fixes according to our jshintrc rules | Thomas Müller | 2014-04-07 | 1 | -58/+56 |
| | | | |||||
| * | | fixing mkdir code to respect external file systems as well | Thomas Müller | 2014-04-07 | 1 | -3/+3 |
| | | | |||||
| * | | 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 | 4 | -13/+61 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * | | 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 | 3 | -13/+13 |
| | | | | |||||
| | * | | Feature Added : Ability to drag and drop in Chrome | Luke Policinski | 2014-02-19 | 4 | -13/+59 |
| | | | | |||||
* | | | | Merge pull request #8211 from owncloud/flush-head-master | Thomas Müller | 2014-04-15 | 3 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Flush the Buffer Early - right after head | ||||
| * | | | | Flush the Buffer Early - right after head | Thomas Müller | 2014-04-15 | 3 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #8210 from owncloud/enhance-assets-management-master | Lukas Reschke | 2014-04-15 | 1 | -1/+30 |
|\ \ \ \ \ | | | | | | | | | | | | | adding checks and log messages regarding the assets folder | ||||
| * | | | | | adding checks and log messages regarding the assets folder | Thomas Müller | 2014-04-15 | 1 | -1/+30 |
| |/ / / / | |||||
* | | | | | Merge pull request #8197 from owncloud/secure_mimetypes | Lukas Reschke | 2014-04-15 | 5 | -112/+170 |
|\ \ \ \ \ | | | | | | | | | | | | | White-list known secure mime types. Refs. #8184 | ||||
| * | | | | | Added explanation to mimetypes.list.php to avoid future confusion. | Thomas Tanghus | 2014-04-14 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | White-list known secure mime types. Refs. #8184 | Thomas Tanghus | 2014-04-14 | 5 | -112/+166 |
| | | | | | | |||||
* | | | | | | Merge pull request #8216 from owncloud/usermanager_fix_limitoffset | blizzz | 2014-04-15 | 6 | -35/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove limit and offset manipulation when getting users or groups, be… | ||||
| * | | | | | | adjust tests accordingly | Arthur Schiwon | 2014-04-15 | 3 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Remove limit and offset manipulation when getting users or groups, because ↵ | Arthur Schiwon | 2014-04-15 | 3 | -32/+0 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint | ||||
* | | | | | | Merge pull request #8127 from owncloud/searchresults-mobile | Thomas Müller | 2014-04-15 | 2 | -7/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | make search results work on mobile as well | ||||
| * | | | | | | search: fix color hex code | Jan-Christoph Borchardt | 2014-04-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix search box wrapping on very narrow screens | Jan-Christoph Borchardt | 2014-04-09 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | search: change date color to grey for less distraction | Jan-Christoph Borchardt | 2014-04-09 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | increase height of result for better clickability | Jan-Christoph Borchardt | 2014-04-09 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | make search results work on mobile as well | Jan-Christoph Borchardt | 2014-04-09 | 1 | -6/+9 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #8209 from owncloud/set-language-explicitly-master | Thomas Müller | 2014-04-15 | 2 | -0/+11 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Set language explicitly master | ||||
| * | | | | | | OCS API calls will always return English messages | Thomas Müller | 2014-04-15 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | introduce new function to force a language | Thomas Müller | 2014-04-15 | 1 | -0/+8 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #8200 from owncloud/js-cleanup-dialogs-master | Thomas Müller | 2014-04-15 | 1 | -173/+166 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | javascript code cleanup + fixing syntax errors | ||||
| * | | | | | | javascript code cleanup + fixing syntax errors | Thomas Müller | 2014-04-14 | 1 | -173/+166 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7780 from owncloud/share-file-exists | Björn Schießle | 2014-04-15 | 2 | -0/+33 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Verify that a file exists before we share it | ||||
| * | | | | | | | add tests for sharing files the users doesn't have access to | Robin Appelman | 2014-04-03 | 1 | -0/+23 |
| | | | | | | | | |||||
| * | | | | | | | Verify that a file exists before we share it | Robin Appelman | 2014-04-02 | 1 | -0/+10 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #8207 from owncloud/translate-name-email-change | Lukas Reschke | 2014-04-15 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make email, display name change translatable again | ||||
| * | | | | | | | | Make email display name change translatable again | Volkan Gezer | 2014-04-15 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-15 | 12 | -12/+12 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #8059 from owncloud/countUsersInGroup | Lukas Reschke | 2014-04-14 | 8 | -1/+317 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add optional countUsersInGroup method to group backends | ||||
| * | | | | | | | | add tests for LDAP | Arthur Schiwon | 2014-04-08 | 1 | -0/+115 |
| | | | | | | | | | |||||
| * | | | | | | | | fix return value when a search string was passed to return integer instead ↵ | Arthur Schiwon | 2014-04-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of array | ||||
| * | | | | | | | | add group tests | Arthur Schiwon | 2014-04-08 | 1 | -0/+62 |
| | | | | | | | | | |||||
| * | | | | | | | | ask implementsAction instead of checking method_exists for easier testing | Arthur Schiwon | 2014-04-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | implement countUsersInGroup in LDAP group backend | Arthur Schiwon | 2014-04-08 | 2 | -1/+92 |
| | | | | | | | | |