summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11347 from mark0n/create_empty_configLukas Reschke2014-09-292-0/+52
|\
| * Add a CLI command that creates an empty LDAP configMartin Konrad2014-09-292-0/+52
* | Merge pull request #10107 from owncloud/sharing_group_sharesLukas Reschke2014-09-298-48/+243
|\ \
| * | some small fixed, suggested by scrutinizerBjoern Schiessle2014-09-292-4/+4
| * | throw a exception if we can't handle the provided pathBjoern Schiessle2014-09-294-3/+75
| * | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c...Bjoern Schiessle2014-09-252-6/+61
| * | some small fixesBjoern Schiessle2014-09-252-4/+4
| * | clear share table after each test runBjoern Schiessle2014-09-241-0/+3
| * | unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-222-35/+74
| * | group shares and combine permissionsBjoern Schiessle2014-09-223-3/+29
* | | Merge pull request #11321 from owncloud/ldap-fix-memberof-detectionLukas Reschke2014-09-291-2/+4
|\ \ \
| * | | dn needs to be fetched to be able to detect memberOf supportArthur Schiwon2014-09-261-2/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-293-0/+6
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-286-5/+36
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-273-0/+3
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-263-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2516-4/+43
* | Show a proper error message when trying to scan the filesystem for a non exis...Robin Appelman2014-09-241-1/+5
* | Check for blacklisted charactersLukas Reschke2014-09-231-0/+6
* | Merge pull request #11109 from owncloud/nstamm-patch-1Jan-Christoph Borchardt2014-09-231-1/+8
|\ \
| * | adjust text size and opacity of drag'n'drop upload text styleJan-Christoph Borchardt2014-09-231-0/+4
| * | DragnDrop Upload text styleNicolas Stamm2014-09-161-1/+4
* | | Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-236-11/+20
|\ \ \
| * | | force show the loading icon in list for deletion, not only on hoverJan-Christoph Borchardt2014-09-221-0/+9
| * | | correct progress-icon to icon-loading-smallJan-Christoph Borchardt2014-09-224-10/+10
| * | | correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-225-11/+11
* | | | Merge pull request #11137 from owncloud/enc-pregfixVincent Petry2014-09-2310-113/+384
|\ \ \ \
| * | | | Fix share key finding algorithm in various casesVincent Petry2014-09-2310-113/+384
| | |/ / | |/| |
* | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-231-2/+7
|\ \ \ \
| * | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-221-2/+7
* | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_userLukas Reschke2014-09-231-5/+4
|\ \ \ \ \
| * | | | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-221-5/+4
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-233-0/+3
| |_|_|/ / |/| | | |
* | | | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteraceconditionVincent Petry2014-09-221-0/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added extra check to avoid deleting key foldersVincent Petry2014-09-191-0/+26
* | | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxyMorris Jobke2014-09-221-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-181-0/+1
* | | | | fix button text l10nVolkan Gezer2014-09-221-1/+1
* | | | | files_sharing: add route for ajax/publicpreviewGeorg Ehrke2014-09-211-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-212-2/+12
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-205-12/+25
* | | | | fix typoVolkan Gezer2014-09-191-1/+1
| |/ / / |/| | |
* | | | Merge pull request #10968 from owncloud/admin-groupsselect2Lukas Reschke2014-09-1959-5409/+2
|\ \ \ \
| * | | | Move select2 from files_external to coreVincent Petry2014-09-0959-5409/+2
* | | | | Merge pull request #11104 from owncloud/enc_create_backup_on_recoveryLukas Reschke2014-09-194-1/+62
|\ \ \ \ \
| * | | | | make sure that we really catch the files folder onlyBjoern Schiessle2014-09-191-1/+1
| * | | | | create backup from all keys before recoveryBjoern Schiessle2014-09-193-0/+61
* | | | | | Merge pull request #11171 from owncloud/fix-routeLukas Reschke2014-09-191-1/+1
|\ \ \ \ \ \
| * | | | | | Match more URL fragmentsLukas Reschke2014-09-181-1/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1910-18/+56
|/ / / / / /