summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 6.0.8 RC1v6.0.8RC1Frank Karlitschek2015-05-291-2/+2
* Merge pull request #14499 from owncloud/kill-substr-mssql-stable6Lukas Reschke2015-03-261-99/+0
|\
| * Remove hacky Substring support for MSSQLLukas Reschke2015-02-251-99/+0
* | Merge pull request #14729 from owncloud/stable6-versioning_fix_pathMorris Jobke2015-03-241-2/+2
|\ \ | |/ |/|
| * make sure that the versions array contains the correct pathBjoern Schiessle2015-03-061-2/+2
|/
* 6.0.7v6.0.7Frank Karlitschek2015-02-161-2/+2
* Merge pull request #14150 from owncloud/no-whitespace-from-themes-stable6Thomas Müller2015-02-191-5/+5
|\
| * catch any whitespaces which might get written to the output buffer while load...Thomas Müller2015-02-121-5/+5
* | Merge pull request #14255 from owncloud/console-execution-time-stable6Morris Jobke2015-02-161-0/+3
|\ \ | |/ |/|
| * console commands shall not be limited with respect to execution timeThomas Müller2015-02-161-0/+3
|/
* Normalize before processingLukas Reschke2015-02-064-6/+39
* 6.0.7 RC1Frank Karlitschek2015-02-061-2/+2
* Merge pull request #12736 from owncloud/temp-handling-stable6Morris Jobke2015-01-098-90/+352
|\
| * Use the TempManager to handle temporary filesRobin Appelman2015-01-083-90/+7
| * Add \OC\TempManager to handle creating and cleaning temporary filesRobin Appelman2015-01-085-0/+345
* | Merge pull request #13177 from owncloud/stable6-extstorage-fixsharedmountpoin...Morris Jobke2015-01-091-1/+3
|\ \ | |/ |/|
| * Fix source path when share is a mount pointVincent Petry2015-01-081-1/+3
|/
* Added error check to lib/private/image.phpByron Marohn2015-01-021-0/+6
* Skip headers that can not be splitVictor Dubiniuk2014-12-101-0/+3
* 6.0.6v6.0.6Frank Karlitschek2014-11-071-2/+2
* logging changesCraig Morrissey2014-11-071-0/+3
* Merge pull request #11706 from owncloud/fix_trash_stable6Björn Schießle2014-10-231-0/+3
|\
| * make sure that trash bin is initialized for both the current user and the fil...Bjoern Schiessle2014-10-221-0/+3
|/
* no error if we try to delete a file which no longer existsBjoern Schiessle2014-10-211-1/+3
* backport of #11494Arthur Schiwon2014-10-204-34/+65
* Merge pull request #11217 from owncloud/backport-9225-stable6blizzz2014-10-206-44/+465
|\
| * Merge branch 'voxsim-backport-9225-stable6' into backport-9225-stable6Arthur Schiwon2014-10-166-22/+137
| |\
| | * Fix in stable6 after backport of #9225Simon Vocella2014-09-241-1/+3
| | * ask implementsAction instead of checking method_exists for easier testingArthur Schiwon2014-09-241-1/+1
| | * 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