summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-16422-6391/+6408
|
* Merge pull request #8104 from owncloud/lukepolo-masterThomas Müller2014-04-156-75/+145
|\ | | | | Added the ability to Drag and Drop folders [chrome]
| * add link to further discussion about that folder checkThomas Müller2014-04-151-0/+1
| |
| * drop folder support on public shared foldersThomas Müller2014-04-111-1/+7
| |
| * 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-09564-8251/+20628
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js
| * | js style fixes according to our jshintrc rulesThomas Müller2014-04-071-58/+56
| | |
| * | fixing mkdir code to respect external file systems as wellThomas Müller2014-04-071-3/+3
| | |
| * | 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-074-13/+61
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| | * | 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-193-13/+13
| | | |
| | * | Feature Added : Ability to drag and drop in ChromeLuke Policinski2014-02-194-13/+59
| | | |
* | | | Merge pull request #8211 from owncloud/flush-head-masterThomas Müller2014-04-153-3/+3
|\ \ \ \ | | | | | | | | | | Flush the Buffer Early - right after head
| * | | | Flush the Buffer Early - right after headThomas Müller2014-04-153-3/+3
| | | | |
* | | | | Merge pull request #8210 from owncloud/enhance-assets-management-masterLukas Reschke2014-04-151-1/+30
|\ \ \ \ \ | | | | | | | | | | | | adding checks and log messages regarding the assets folder
| * | | | | adding checks and log messages regarding the assets folderThomas Müller2014-04-151-1/+30
| |/ / / /
* | | | | Merge pull request #8197 from owncloud/secure_mimetypesLukas Reschke2014-04-155-112/+170
|\ \ \ \ \ | | | | | | | | | | | | White-list known secure mime types. Refs. #8184
| * | | | | Added explanation to mimetypes.list.php to avoid future confusion.Thomas Tanghus2014-04-141-0/+4
| | | | | |
| * | | | | White-list known secure mime types. Refs. #8184Thomas Tanghus2014-04-145-112/+166
| | | | | |
* | | | | | Merge pull request #8216 from owncloud/usermanager_fix_limitoffsetblizzz2014-04-156-35/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove limit and offset manipulation when getting users or groups, be…
| * | | | | | adjust tests accordinglyArthur Schiwon2014-04-153-3/+3
| | | | | | |
| * | | | | | Remove limit and offset manipulation when getting users or groups, because ↵Arthur Schiwon2014-04-153-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-mobileThomas Müller2014-04-152-7/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | make search results work on mobile as well
| * | | | | | search: fix color hex codeJan-Christoph Borchardt2014-04-151-1/+1
| | | | | | |
| * | | | | | fix search box wrapping on very narrow screensJan-Christoph Borchardt2014-04-091-0/+1
| | | | | | |
| * | | | | | search: change date color to grey for less distractionJan-Christoph Borchardt2014-04-091-0/+1
| | | | | | |
| * | | | | | increase height of result for better clickabilityJan-Christoph Borchardt2014-04-091-1/+1
| | | | | | |
| * | | | | | make search results work on mobile as wellJan-Christoph Borchardt2014-04-091-6/+9
| | | | | | |
* | | | | | | Merge pull request #8209 from owncloud/set-language-explicitly-masterThomas Müller2014-04-152-0/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Set language explicitly master
| * | | | | | OCS API calls will always return English messagesThomas Müller2014-04-151-0/+3
| | | | | | |
| * | | | | | introduce new function to force a languageThomas Müller2014-04-151-0/+8
|/ / / / / /
* | | | | | Merge pull request #8200 from owncloud/js-cleanup-dialogs-masterThomas Müller2014-04-151-173/+166
|\ \ \ \ \ \ | | | | | | | | | | | | | | javascript code cleanup + fixing syntax errors
| * | | | | | javascript code cleanup + fixing syntax errorsThomas Müller2014-04-141-173/+166
| | | | | | |
* | | | | | | Merge pull request #7780 from owncloud/share-file-existsBjörn Schießle2014-04-152-0/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Verify that a file exists before we share it
| * | | | | | | add tests for sharing files the users doesn't have access toRobin Appelman2014-04-031-0/+23
| | | | | | | |
| * | | | | | | Verify that a file exists before we share itRobin Appelman2014-04-021-0/+10
| | | | | | | |
* | | | | | | | Merge pull request #8207 from owncloud/translate-name-email-changeLukas Reschke2014-04-152-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make email, display name change translatable again
| * | | | | | | | Make email display name change translatable againVolkan Gezer2014-04-152-2/+2
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1512-12/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #8059 from owncloud/countUsersInGroupLukas Reschke2014-04-148-1/+317
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add optional countUsersInGroup method to group backends
| * | | | | | | | add tests for LDAPArthur Schiwon2014-04-081-0/+115
| | | | | | | | |
| * | | | | | | | fix return value when a search string was passed to return integer instead ↵Arthur Schiwon2014-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of array
| * | | | | | | | add group testsArthur Schiwon2014-04-081-0/+62
| | | | | | | | |
| * | | | | | | | ask implementsAction instead of checking method_exists for easier testingArthur Schiwon2014-04-081-1/+1
| | | | | | | | |
| * | | | | | | | implement countUsersInGroup in LDAP group backendArthur Schiwon2014-04-082-1/+92
| | | | | | | | |