Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsm... | Thomas Müller | 2015-12-17 | 9 | -21/+1184 |
|\ | |||||
| * | avoid duplicates on search | Björn Schießle | 2015-12-15 | 2 | -15/+33 |
| * | Fix last Oracle issue | Thomas Müller | 2015-12-15 | 1 | -1/+1 |
| * | Fix Oracle insert error | Thomas Müller | 2015-12-15 | 2 | -4/+8 |
| * | implement delete, create, update, search, get permissions | Björn Schießle | 2015-12-15 | 10 | -123/+1133 |
| * | save wip | Thomas Müller | 2015-12-11 | 2 | -0/+131 |
* | | Merge pull request #21255 from owncloud/usermanagement-show-password-error-te... | Thomas Müller | 2015-12-17 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update users.js | michag86 | 2015-12-17 | 1 | -1/+1 |
* | | | Merge pull request #21260 from owncloud/fix-undefined-l10n-var | Thomas Müller | 2015-12-17 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | initialize l10n instance earlier, fixes an undefined var warning followed by ... | Arthur Schiwon | 2015-12-17 | 1 | -3/+1 |
* | | | | Merge pull request #21259 from owncloud/load_big_avatar_only_personal | Thomas Müller | 2015-12-17 | 2 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | Only load the big (128x128) avatar on the perosnal page | Roeland Jago Douma | 2015-12-17 | 2 | -2/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21251 from owncloud/make-occ-more-error-proof | Thomas Müller | 2015-12-17 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | occ command can only be called from ownCloud root directory | Morris Jobke | 2015-12-17 | 1 | -0/+10 |
* | | | | | Merge pull request #21200 from owncloud/files-authorizationheader | Thomas Müller | 2015-12-17 | 8 | -14/+122 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Load base64 polyfill in IE and friends | Vincent Petry | 2015-12-14 | 1 | -0/+2 |
| * | | | | Add davidchambers/base64 JS library | Vincent Petry | 2015-12-14 | 5 | -1/+108 |
| * | | | | Use Authorization headers for public webdav instead of URL | Vincent Petry | 2015-12-14 | 2 | -13/+12 |
* | | | | | Merge pull request #21201 from mmattel/scanFiles_stat_output_II | Thomas Müller | 2015-12-17 | 1 | -6/+184 |
|\ \ \ \ \ | |||||
| * | | | | | Statistics output for ./occ files:scan | martin.mattel@diemattels.at | 2015-12-15 | 1 | -6/+184 |
| |/ / / / | |||||
* | | | | | Merge pull request #21240 from owncloud/avatar_speedup | Thomas Müller | 2015-12-17 | 5 | -45/+116 |
|\ \ \ \ \ | |||||
| * | | | | | [Avatar] Make the avatar controller use the avatar node | Roeland Jago Douma | 2015-12-16 | 2 | -26/+40 |
| * | | | | | [Avatars] Add function to get the Node of the avatar | Roeland Jago Douma | 2015-12-16 | 3 | -19/+76 |
* | | | | | | Merge pull request #21253 from owncloud/deprecated_oc_helper_linkTo | Thomas Müller | 2015-12-17 | 7 | -70/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove deprecated OC_Helper::linkTo function | Roeland Jago Douma | 2015-12-17 | 2 | -61/+0 |
| * | | | | | | OC_Helper::linkTo is deprecated | Roeland Jago Douma | 2015-12-17 | 6 | -9/+9 |
* | | | | | | | Merge pull request #21244 from owncloud/remove-unavailable-setting-from-sampl... | Thomas Müller | 2015-12-17 | 1 | -16/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | enforce_home_folder_naming_rule cannot be configured in config.php | blizzz | 2015-12-16 | 1 | -16/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #21241 from owncloud/fix_21226 | Thomas Müller | 2015-12-17 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Do not try to get the avatar if there is no user | Roeland Jago Douma | 2015-12-17 | 1 | -1/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21238 from owncloud/files-fixparsewebdavmtime | Thomas Müller | 2015-12-17 | 2 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix files UI mtime parsing from webdav | Vincent Petry | 2015-12-16 | 2 | -6/+6 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-17 | 30 | -42/+70 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #21184 from owncloud/cli-logger-embedded-webserver | Thomas Müller | 2015-12-16 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Let's print error messages to the builtin webserver console ... makes develop... | Thomas Müller | 2015-12-14 | 1 | -0/+3 |
* | | | | | Merge pull request #21232 from owncloud/fix-21230 | Thomas Müller | 2015-12-16 | 2 | -1/+42 |
|\ \ \ \ \ | |||||
| * | | | | | add unit test for #21230 | Morris Jobke | 2015-12-16 | 1 | -0/+41 |
| * | | | | | Use name of ICollection for exception message | Morris Jobke | 2015-12-16 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #21229 from owncloud/contrib-linktomaintainerspageforapps | Thomas Müller | 2015-12-16 | 1 | -14/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Replace list of apps with a link | Vincent Petry | 2015-12-16 | 1 | -14/+2 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-16 | 2 | -0/+20 |
* | | | | Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users | C. Montero Luque | 2015-12-15 | 4 | -9/+203 |
|\ \ \ \ | |||||
| * | | | | fix find DN by UUID for AD | Arthur Schiwon | 2015-12-14 | 1 | -13/+56 |
| * | | | | unit test on getHome in combination with OfflineUser | Arthur Schiwon | 2015-12-11 | 1 | -2/+52 |
| * | | | | adjust unit test | Arthur Schiwon | 2015-12-11 | 1 | -0/+8 |
| * | | | | look for DN changes before marking a user as deleted | Arthur Schiwon | 2015-12-11 | 3 | -3/+76 |
| * | | | | throw NoUserException in getHome when the requested user does not exist anymore | Arthur Schiwon | 2015-12-11 | 1 | -5/+25 |
* | | | | | Merge pull request #21189 from owncloud/fix_21187 | Thomas Müller | 2015-12-15 | 2 | -1/+4 |
|\ \ \ \ \ | |||||
| * | | | | | File shares can't have create permissions | Roeland Jago Douma | 2015-12-14 | 2 | -1/+4 |
* | | | | | | Merge pull request #21067 from owncloud/fix_20296 | Thomas Müller | 2015-12-15 | 10 | -8/+105 |
|\ \ \ \ \ \ |