summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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-223-1/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-213-4/+39
|/
* 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-192-0/+7
* | Merge pull request #8220 from owncloud/type-hinting-ldapblizzz2014-04-176-4/+25
|\ \
| * | Add missing param hintBart Visscher2014-04-161-0/+1
| * | Fix PHPdoc in user_ldapBart Visscher2014-04-156-4/+24
* | | Merge pull request #8236 from owncloud/header-right-fixMorris Jobke2014-04-171-29/+0
|\ \ \
| * | | fix header code duplication, code style fixesJan-Christoph Borchardt2014-04-161-16/+0
| * | | remove duplication of 'header-right' element, also make it overflow when too ...Jan-Christoph Borchardt2014-04-161-13/+0
* | | | Merge pull request #8189 from Xenopathic/misc_fixesRobin McCorkell2014-04-172-15/+15
|\ \ \ \
| * | | | Fix user_ldap default setting valueRobin McCorkell2014-04-131-1/+1
| * | | | Prevent error in files_trashbinRobin McCorkell2014-04-131-7/+9
| * | | | Adjust logic for deciding if trashbin emptyRobin McCorkell2014-04-131-7/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-171-1/+1
* | | | | 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-1650-96/+106
* | | | | Merge pull request #8104 from owncloud/lukepolo-masterThomas Müller2014-04-155-75/+134
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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-0979-329/+833
| |\ \ \ \
| * | | | | 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 pull request #7780 from owncloud/share-file-existsBjörn Schießle2014-04-151-0/+23
|\ \ \ \ \ \ \
| * | | | | | | add tests for sharing files the users doesn't have access toRobin Appelman2014-04-031-0/+23
* | | | | | | | Merge pull request #8059 from owncloud/countUsersInGroupLukas Reschke2014-04-143-1/+208
|\ \ \ \ \ \ \ \
| * | | | | | | | add tests for LDAPArthur Schiwon2014-04-081-0/+115
| * | | | | | | | fix return value when a search string was passed to return integer instead of...Arthur Schiwon2014-04-081-1/+2
| * | | | | | | | implement countUsersInGroup in LDAP group backendArthur Schiwon2014-04-082-1/+92
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-143-0/+13
* | | | | | | | | Check whether the user has permissions to add personal storage backendsLukas Reschke2014-04-131-0/+6
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1311-0/+15