summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* increase version. This time for realFrank Karlitschek2015-01-181-1/+1
* Merge pull request #13457 from owncloud/enc-skippartfilesThomas Müller2015-01-191-0/+55
|\
| * Add class attribute types in encryption Util classVincent Petry2015-01-191-0/+51
| * Skip stray part files during initial encryptionVincent Petry2015-01-191-0/+4
* | Merge pull request #13377 from owncloud/trashbin_storage_wrapperMorris Jobke2015-01-199-53/+109
|\ \
| * | replace hook with storage wrapperBjoern Schiessle2015-01-199-53/+109
* | | Merge pull request #13423 from owncloud/share-fixfindshareforuserwithmultiple...Thomas Müller2015-01-192-9/+53
|\ \ \
| * | | Fix getItemSharedWithUser for groupsVincent Petry2015-01-162-9/+53
* | | | Merge pull request #13362 from owncloud/fix-11442Thomas Müller2015-01-193-38/+92
|\ \ \ \ | |_|_|/ |/| | |
| * | | coding styleArthur Schiwon2015-01-152-5/+8
| * | | update user or group count only, when the multiselect is closedArthur Schiwon2015-01-141-4/+34
| * | | allow to read again objectclasses and groups under certain conditionsArthur Schiwon2015-01-142-2/+31
| * | | JS cleanupArthur Schiwon2015-01-133-34/+26
* | | | Merge pull request #13443 from owncloud/fix-filtering-for-usersThomas Müller2015-01-192-1/+128
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix filtering for users when $gid is emptyLukas Reschke2015-01-182-1/+128
* | | | Merge pull request #13438 from owncloud/cache-the-arrayThomas Müller2015-01-191-70/+71
|\ \ \ \
| * | | | Reuse the array key of mimetypesLukas Reschke2015-01-181-70/+71
* | | | | Merge pull request #13447 from owncloud/fix_typoJoas Schilling2015-01-191-1/+1
|\ \ \ \ \
| * | | | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154Morris Jobke2015-01-181-1/+1
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1910-14/+20
* | | | | Merge pull request #13448 from owncloud/fix-exif-orientationGeorg Ehrke2015-01-191-5/+12
|\ \ \ \ \
| * | | | | Fix exif orientation for flipped imagesMorris Jobke2015-01-181-5/+12
|/ / / / /
* | | | | Merge pull request #13276 from Sugaroverdose/fix_#11348Morris Jobke2015-01-182-4/+18
|\ \ \ \ \
| * | | | | Add ie8 text-overflow: ellipsis supportSugaroverdose2015-01-171-0/+11
| * | | | | use some magic to make 'popular browsers' workSugaroverdose2015-01-161-0/+2
| * | | | | fix_#11348 Safari rename button positioningSergei Shuykov2015-01-162-5/+6
* | | | | | Merge pull request #13433 from owncloud/favoritesl10nLukas Reschke2015-01-182-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix unlocalized favorites browser title and alttextVolkan Gezer2015-01-172-2/+2
| | |/ / / | |/| | |
* | | | | 8.0.0 beta 2v8.0.0beta1Frank Karlitschek2015-01-181-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1816-22/+62
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1766-116/+946
* | | | Merge pull request #13319 from owncloud/replace-line-breaks-in-app-descriptionLukas Reschke2015-01-172-1/+67
|\ \ \ \
| * | | | OC_App::parseAppInfoMorris Jobke2015-01-142-1/+67
* | | | | Merge pull request #13421 from owncloud/fix-renameRobin McCorkell2015-01-161-1/+1
|\ \ \ \ \
| * | | | | Fixes shifted rename fieldMorris Jobke2015-01-161-1/+1
|/ / / / /
* | | | | Merge pull request #13418 from owncloud/app-iconsMorris Jobke2015-01-163-118/+10
|\ \ \ \ \
| * | | | | compress icons of LDAP and WebDAV-AuthJan-Christoph Borchardt2015-01-162-118/+6
| * | | | | add icon for Provisioning APIJan-Christoph Borchardt2015-01-161-0/+4
|/ / / / /
* | | | | Merge pull request #13399 from owncloud/trashbin-fixpreviewrouteMorris Jobke2015-01-161-5/+2
|\ \ \ \ \
| * | | | | Fix preview route for trashbinVincent Petry2015-01-151-5/+2
* | | | | | Merge pull request #13413 from owncloud/apps-cancelloadonswitchMorris Jobke2015-01-161-2/+9
|\ \ \ \ \ \
| * | | | | | Cancel app list load when switching categoriesVincent Petry2015-01-161-2/+9
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfileMorris Jobke2015-01-161-27/+59
|\ \ \ \ \ \
| * | | | | | remove unused variable and fix undefined variableThomas Müller2015-01-081-5/+4
| * | | | | | Disable part files for OC ext storage backend + s2s backendVincent Petry2015-01-071-28/+61
* | | | | | | Merge pull request #13412 from owncloud/app-management-sortMorris Jobke2015-01-161-0/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | sorting enabled and disabled apps alphabetically - fixes #13404Thomas Müller2015-01-161-0/+16
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-16242-84/+416
* | | | | | Merge pull request #13406 from owncloud/fix-php-docFrank Karlitschek2015-01-151-0/+1
|\ \ \ \ \ \
| * | | | | | Fix PHPDocLukas Reschke2015-01-151-0/+1