summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Fix getting group '0' from database backendJoas Schilling2014-09-242-2/+2
| | * add optional countUsersInGroup method to group backendsArthur Schiwon2014-09-244-2/+73
| | * remove unneeded ; in commentRobin Appelman2014-09-241-1/+1
| | * user Group->users as assosiative arrayRobin Appelman2014-09-241-5/+3
| | * cache the result from inGroupRobin Appelman2014-09-241-7/+20
| | * Fix test cases for group managerRobin Appelman2014-09-242-4/+37
| | * remove duplicate call to groupExistsRobin Appelman2014-09-241-6/+4
| |/
| * Backport of #9225voxsim2014-09-222-22/+328
* | Merge pull request #11371 from owncloud/backport-11368Lukas Reschke2014-10-205-15/+60
|\ \
| * | Fix SVG iconsLukas Reschke2014-10-162-1/+11
| * | Load public preview via JSLukas Reschke2014-10-014-15/+50
* | | Merge pull request #10576 from owncloud/ajaxify_user_list_for_files_external_...Frank Karlitschek2014-10-1866-54/+5672
|\ \ \
| * | | fix flickering usersJörn Friedrich Dreyer2014-10-131-1/+1
| * | | no need to load display namesArthur Schiwon2014-10-131-1/+0
| * | | fix deletion of sharesJörn Friedrich Dreyer2014-10-131-22/+23
| * | | replace chosen with select2 to provide ajaxified user and group selection for...Jörn Friedrich Dreyer2014-10-136-35/+222
| * | | add select2 to app specific thirdpartyJörn Friedrich Dreyer2014-10-1360-0/+5431
* | | | Merge pull request #11560 from owncloud/stable6-encsharekeymatchingdirectback...Lukas Reschke2014-10-1710-114/+391
|\ \ \ \
| * | | | Disabled assert known to failVincent Petry2014-10-161-0/+3
| * | | | Remove FileInfo instance checkVincent Petry2014-10-151-1/+0
| * | | | Removed broken/unneeded fixFileSizeVincent Petry2014-10-151-2/+0
| * | | | Fix share key finding algorithm in various casesVincent Petry2014-10-1510-112/+389
* | | | | Merge pull request #11248 from owncloud/11032-backport-stable6Lukas Reschke2014-10-167-48/+298
|\ \ \ \ \
| * | | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-237-48/+298
* | | | | | 6.0.6 RC1v6.0.6RC1Frank Karlitschek2014-10-161-2/+2
| |/ / / / |/| | | |
* | | | | Merge pull request #11561 from owncloud/stable6-enc-webdavcopywithencryptionfixVincent Petry2014-10-156-46/+168
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | make sure that we always find all versionsBjoern Schiessle2014-10-142-23/+37
| * | | | add unit test for rename and copy operationBjoern Schiessle2014-10-143-9/+66
| * | | | make the versions and encryption app aware of the copy operationBjoern Schiessle2014-10-145-16/+67
|/ / / /
* | | | force loading of encryption appLukas Reschke2014-10-131-0/+3
* | | | Prevent button click when enter key is pressed in LDAP wizardVincent Petry2014-10-103-4/+4
* | | | Show a proper error message when trying to scan the filesystem for a non exis...Robin Appelman2014-10-101-1/+5
* | | | Don't keep the full info of all children in memoryRobin Appelman2014-10-101-7/+12
* | | | Backport of #10527Arthur Schiwon2014-10-092-12/+32
* | | | Merge pull request #8307 from owncloud/case_insensitive_search_oracle_stable6Lukas Reschke2014-10-032-3/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | fix case insensitive search on oracle and postgresqlJörn Friedrich Dreyer2014-09-292-3/+28
* | | | Merge pull request #11153 from owncloud/parallel-upload-stable6Lukas Reschke2014-10-011-1/+15
|\ \ \ \ | |/ / / |/| | |
| * | | use session_write_close() because the Session class has no close() yet in thi...Thomas Müller2014-09-181-1/+1
| * | | close the session for all DAV calls right after authentication - no need to w...Thomas Müller2014-09-181-1/+15
| | |/ | |/|
* | | Clarify possible preview providers for type OfficeLukas Reschke2014-09-252-2/+10
* | | Merge pull request #11246 from owncloud/backport-11211-stable6Morris Jobke2014-09-237-79/+56
|\ \ \
| * \ \ Merge branch 'stable6' into backport-11211-stable6Lukas Reschke2014-09-232-7/+10
| |\ \ \
| * | | | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-237-79/+56
* | | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-231-1/+2
| |/ / / |/| | |
* | | | Use non-empty defaultsVictor Dubiniuk2014-09-231-1/+1
| |_|/ |/| |
* | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-231-6/+9
|/ /
* | Added extra check to avoid deleting key foldersVincent Petry2014-09-221-0/+26
* | Merge pull request #11207 from owncloud/enc_create_backup_on_recovery_oc6Lukas Reschke2014-09-223-0/+97
|\ \ | |/ |/|
| * create backup from all keys before recoveryBjoern Schiessle2014-09-223-0/+97
|/
* Revert "Reword the description"Lukas Reschke2014-09-162-3/+3