summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix failing unit testsThomas Müller2015-12-181-1/+1
* Fix carddav sharing plugin + adding unit testsThomas Müller2015-12-185-63/+166
* Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errorsThomas Müller2015-12-187-7/+22
|\
| * Clear xml errors in updaterThomas Müller2015-12-171-0/+2
| * Clear xml errors in ocs clientThomas Müller2015-12-171-0/+1
| * Only perform tearDown operations on the database if we have a connection to i...Thomas Müller2015-12-171-4/+6
| * Use proper base classThomas Müller2015-12-173-3/+6
| * Clear xml errorsThomas Müller2015-12-171-0/+1
| * Assert that there are no xml error leftThomas Müller2015-12-171-0/+6
* | Merge pull request #21190 from owncloud/bump_doctrine_depsThomas Müller2015-12-181-0/+0
|\ \
| * | [3rdparty] Bump doctrine depsRoeland Jago Douma2015-12-181-0/+0
| |/
* | Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRouteThomas Müller2015-12-186-25/+12
|\ \
| * | Remove private deprecated OC_Helper::linkToRouteRoeland Jago Douma2015-12-171-13/+0
| * | OC_Helper::linkToRoute is deprecatedRoeland Jago Douma2015-12-176-12/+12
| |/
* | Merge pull request #21247 from owncloud/placeholder_sizeThomas Müller2015-12-184-13/+7
|\ \ | |/ |/|
| * Since avatar.js is now essentially empty remove itRoeland Jago Douma2015-12-172-6/+0
| * Add a default size to the avatar placeholdersRoeland Jago Douma2015-12-173-7/+7
* | Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsm...Thomas Müller2015-12-179-21/+1184
|\ \ | |/ |/|
| * avoid duplicates on searchBjörn Schießle2015-12-152-15/+33
| * Fix last Oracle issueThomas Müller2015-12-151-1/+1
| * Fix Oracle insert errorThomas Müller2015-12-152-4/+8
| * implement delete, create, update, search, get permissionsBjörn Schießle2015-12-1510-123/+1133
| * save wipThomas Müller2015-12-112-0/+131
* | Merge pull request #21255 from owncloud/usermanagement-show-password-error-te...Thomas Müller2015-12-171-1/+1
|\ \
| * | Update users.jsmichag862015-12-171-1/+1
* | | Merge pull request #21260 from owncloud/fix-undefined-l10n-varThomas Müller2015-12-171-3/+1
|\ \ \
| * | | initialize l10n instance earlier, fixes an undefined var warning followed by ...Arthur Schiwon2015-12-171-3/+1
* | | | Merge pull request #21259 from owncloud/load_big_avatar_only_personalThomas Müller2015-12-172-2/+6
|\ \ \ \
| * | | | Only load the big (128x128) avatar on the perosnal pageRoeland Jago Douma2015-12-172-2/+6
| | |/ / | |/| |
* | | | Merge pull request #21251 from owncloud/make-occ-more-error-proofThomas Müller2015-12-171-0/+10
|\ \ \ \
| * | | | occ command can only be called from ownCloud root directoryMorris Jobke2015-12-171-0/+10
* | | | | Merge pull request #21200 from owncloud/files-authorizationheaderThomas Müller2015-12-178-14/+122
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Load base64 polyfill in IE and friendsVincent Petry2015-12-141-0/+2
| * | | | Add davidchambers/base64 JS libraryVincent Petry2015-12-145-1/+108
| * | | | Use Authorization headers for public webdav instead of URLVincent Petry2015-12-142-13/+12
* | | | | Merge pull request #21201 from mmattel/scanFiles_stat_output_IIThomas Müller2015-12-171-6/+184
|\ \ \ \ \
| * | | | | Statistics output for ./occ files:scanmartin.mattel@diemattels.at2015-12-151-6/+184
| |/ / / /
* | | | | Merge pull request #21240 from owncloud/avatar_speedupThomas Müller2015-12-175-45/+116
|\ \ \ \ \
| * | | | | [Avatar] Make the avatar controller use the avatar nodeRoeland Jago Douma2015-12-162-26/+40
| * | | | | [Avatars] Add function to get the Node of the avatarRoeland Jago Douma2015-12-163-19/+76
* | | | | | Merge pull request #21253 from owncloud/deprecated_oc_helper_linkToThomas Müller2015-12-177-70/+9
|\ \ \ \ \ \
| * | | | | | Remove deprecated OC_Helper::linkTo functionRoeland Jago Douma2015-12-172-61/+0
| * | | | | | OC_Helper::linkTo is deprecatedRoeland Jago Douma2015-12-176-9/+9
* | | | | | | Merge pull request #21244 from owncloud/remove-unavailable-setting-from-sampl...Thomas Müller2015-12-171-16/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | enforce_home_folder_naming_rule cannot be configured in config.phpblizzz2015-12-161-16/+0
| |/ / / / /
* | | | | | Merge pull request #21241 from owncloud/fix_21226Thomas Müller2015-12-171-1/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Do not try to get the avatar if there is no userRoeland Jago Douma2015-12-171-1/+7
| | |/ / / | |/| | |
* | | | | Merge pull request #21238 from owncloud/files-fixparsewebdavmtimeThomas Müller2015-12-172-6/+6
|\ \ \ \ \
| * | | | | Fix files UI mtime parsing from webdavVincent Petry2015-12-162-6/+6
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1730-42/+70
| |_|/ / / |/| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 09:40:02 +0000