Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Use SystemConfig internally | Roeland Jago Douma | 2015-12-18 | 5 | -19/+19 | |
| * | | | | | Inject Config into SystemConfig | Roeland Jago Douma | 2015-12-18 | 5 | -15/+32 | |
| * | | | | | Get rid of legacy OC_Config | Roeland Jago Douma | 2015-12-18 | 7 | -118/+29 | |
* | | | | | | Merge pull request #21280 from owncloud/drop-unused-methods | Thomas Müller | 2015-12-18 | 5 | -182/+15 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Move OC_Helper code to OCP\Util for linkToRemote | Morris Jobke | 2015-12-18 | 3 | -59/+5 | |
| * | | | | | properly use OCP\Util instead of OC_Helper | Morris Jobke | 2015-12-18 | 5 | -69/+10 | |
| * | | | | | OC_Helper::makeURLAbsolute is not used anymore | Morris Jobke | 2015-12-18 | 2 | -54/+0 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #21277 from owncloud/querybuild-joblist | Thomas Müller | 2015-12-18 | 3 | -64/+109 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Make sure the interface and the implementation match | Joas Schilling | 2015-12-18 | 2 | -20/+17 | |
| * | | | | Use the query builder for the joblist queries | Joas Schilling | 2015-12-18 | 2 | -44/+92 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #21279 from owncloud/remove-tmp-methods | Thomas Müller | 2015-12-18 | 24 | -65/+30 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | OC_Helper::userAvatarSet is not used anymore | Morris Jobke | 2015-12-18 | 1 | -10/+0 | |
| * | | | Use TempManager instead of tmpFile | Morris Jobke | 2015-12-18 | 10 | -26/+13 | |
| * | | | Use TempManager instead of tmpFolder | Morris Jobke | 2015-12-18 | 17 | -29/+17 | |
|/ / / | ||||||
* | | | Merge pull request #21278 from owncloud/exclude-scrutinizer-autofixer | Thomas Müller | 2015-12-18 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Exclude scrutinizer-auto-fixer | Lukas Reschke | 2015-12-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType | Thomas Müller | 2015-12-18 | 8 | -24/+9 | |
|\ \ \ | ||||||
| * | | | Use proper public API for OC_Helper::getFileNameMimeType | Morris Jobke | 2015-12-17 | 8 | -24/+9 | |
* | | | | Merge pull request #21264 from owncloud/deprecated_oc_user_methods | Thomas Müller | 2015-12-18 | 28 | -198/+125 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Removed deprecated function OC_User::deleteUser | Roeland Jago Douma | 2015-12-17 | 17 | -60/+66 | |
| * | | | Removed unused deprecated methods | Roeland Jago Douma | 2015-12-17 | 1 | -38/+0 | |
| * | | | Removed deprecated private OC_User::createUser | Roeland Jago Douma | 2015-12-17 | 17 | -62/+29 | |
| * | | | Remove deprecated function OC_User::getManager | Roeland Jago Douma | 2015-12-17 | 11 | -41/+33 | |
* | | | | Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errors | Thomas Müller | 2015-12-18 | 7 | -7/+22 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Clear xml errors in updater | Thomas Müller | 2015-12-17 | 1 | -0/+2 | |
| * | | | Clear xml errors in ocs client | Thomas Müller | 2015-12-17 | 1 | -0/+1 | |
| * | | | Only perform tearDown operations on the database if we have a connection to i... | Thomas Müller | 2015-12-17 | 1 | -4/+6 | |
| * | | | Use proper base class | Thomas Müller | 2015-12-17 | 3 | -3/+6 | |
| * | | | Clear xml errors | Thomas Müller | 2015-12-17 | 1 | -0/+1 | |
| * | | | Assert that there are no xml error left | Thomas Müller | 2015-12-17 | 1 | -0/+6 | |
* | | | | Merge pull request #21190 from owncloud/bump_doctrine_deps | Thomas Müller | 2015-12-18 | 1 | -0/+0 | |
|\ \ \ \ | ||||||
| * | | | | [3rdparty] Bump doctrine deps | Roeland Jago Douma | 2015-12-18 | 1 | -0/+0 | |
| |/ / / | ||||||
* | | | | Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRoute | Thomas Müller | 2015-12-18 | 6 | -25/+12 | |
|\ \ \ \ | ||||||
| * | | | | Remove private deprecated OC_Helper::linkToRoute | Roeland Jago Douma | 2015-12-17 | 1 | -13/+0 | |
| * | | | | OC_Helper::linkToRoute is deprecated | Roeland Jago Douma | 2015-12-17 | 6 | -12/+12 | |
| |/ / / | ||||||
* | | | | Merge pull request #21247 from owncloud/placeholder_size | Thomas Müller | 2015-12-18 | 4 | -13/+7 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Since avatar.js is now essentially empty remove it | Roeland Jago Douma | 2015-12-17 | 2 | -6/+0 | |
| * | | | Add a default size to the avatar placeholders | Roeland Jago Douma | 2015-12-17 | 3 | -7/+7 | |
| | |/ | |/| | ||||||
* | | | 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 | |
| | |/ / | |/| | |