summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1245-63/+18
* | | | | | | Merge pull request #7807 from sarciszewski/patch-1Lukas Reschke2014-04-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update crypt.phpScott Arciszewski2014-03-241-2/+2
| * | | | | | | Update crypt.phpScott Arciszewski2014-03-191-2/+2
* | | | | | | | Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encr...Björn Schießle2014-04-111-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix some localization issues with file encryption/decription stringsVolkan Gezer2014-04-051-3/+3
* | | | | | | | | Typo fix.Volkan Gezer2014-04-111-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1110-6/+32
* | | | | | | | | Merge pull request #8076 from owncloud/enable-dav-browserLukas Reschke2014-04-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Re-enable the sabredav browser pluginRobin Appelman2014-04-061-0/+1
| |/ / / / / / / /
* | | | | | | / / [tx-robot] updated from transifexJenkins for ownCloud2014-04-1014-0/+49
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #8049 from owncloud/filepickersvgMorris Jobke2014-04-093-23/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved code to replace svg with png to OC.UtilVincent Petry2014-04-043-23/+10
* | | | | | | | | Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_jsVincent Petry2014-04-091-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove obsolete codeJörn Friedrich Dreyer2014-04-091-5/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #7837 from owncloud/fix_7530blizzz2014-04-092-7/+237
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | add comment to clearify when a skip in the foreach happensArthur Schiwon2014-04-091-0/+1
| * | | | | | | | define varArthur Schiwon2014-03-211-0/+1