summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8183 from owncloud/move-security-headersMorris Jobke2014-04-165-33/+29
|\
| * Fix typoLukas Reschke2014-04-141-1/+1
| * Typo + Line breaksLukas Reschke2014-04-131-5/+3
| * Remove uneeded usages of nosniffLukas Reschke2014-04-133-10/+0
| * Fix indentationLukas Reschke2014-04-131-1/+2
| * Move security headers to base.phpLukas Reschke2014-04-132-25/+32
* | Merge pull request #7994 from owncloud/fix-login-fieldsMorris Jobke2014-04-161-15/+39
|\ \
| * | fix overlapping infield labelsJan-Christoph Borchardt2014-04-161-1/+1
| * | fix database infield label indentationJan-Christoph Borchardt2014-04-161-1/+3
| * | fix sizing for fields when password is shownJan-Christoph Borchardt2014-04-161-9/+6
| * | make infield labels use less space so pasting in is easierJan-Christoph Borchardt2014-04-011-3/+8
| * | fix log in input sizing caused by core input field switch to pxJan-Christoph Borchardt2014-04-011-11/+31
* | | Merge pull request #8235 from owncloud/fix-error-mobileJan-Christoph Borchardt2014-04-162-2/+10
|\ \ \
| * | | fix error display on smaller screens, fix #8090Jan-Christoph Borchardt2014-04-162-2/+10
* | | | Merge pull request #8157 from owncloud/share-expiration-smooth-hideJan-Christoph Borchardt2014-04-161-5/+6
|\ \ \ \
| * | | | Expiration date is hidden smoothlyVolkan Gezer2014-04-101-5/+6
* | | | | Merge pull request #7815 from owncloud/ldap_fix_usercount_masterblizzz2014-04-161-15/+40
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | replace hardcoded limit of 400 with user controlled ldapPagingSize valueArthur Schiwon2014-04-091-2/+1
| * | | | Put inner loop into own method, let's see whether it makes scrutinizer happierArthur Schiwon2014-04-091-9/+18
| * | | | var count is assigned in the inner loop so it must be checked inside there to...Arthur Schiwon2014-04-091-1/+5
| * | | | initialize variableArthur Schiwon2014-04-091-0/+1
| * | | | LDAP: fix user report i.e. count for LDAP servers with really many usersArthur Schiwon2014-04-091-13/+25
| * | | | LDAP: make sure cache key for paged result cookie matches when limit or offse...Arthur Schiwon2014-04-091-2/+2
* | | | | [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
|\ \ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| | * | | | | | 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 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 folderThomas Müller2014-04-151-1/+30
| |/ / / / / / / /
* | | | | | | | | Merge pull request #8197 from owncloud/secure_mimetypesLukas Reschke2014-04-155-112/+170
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | adjust tests accordinglyArthur Schiwon2014-04-153-3/+3
| * | | | | | | | | | Remove limit and offset manipulation when getting users or groups, because it...Arthur Schiwon2014-04-153-32/+0
|/ / / / / / / / / /