Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #21005 from owncloud/verify_password_before_unshare | Thomas Müller | 2015-12-09 | 1 | -0/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | The ajax code path unshares a link share when updating the password | Roeland Jago Douma | 2015-12-07 | 1 | -0/+5 | |
* | | | | | | Merge pull request #21038 from owncloud/share-computesharepermissions-notstore | Thomas Müller | 2015-12-09 | 3 | -6/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add explicit check for groups excluded from sharing | Vincent Petry | 2015-12-08 | 1 | -1/+1 | |
| * | | | | | | Add reshare permission checks | Vincent Petry | 2015-12-08 | 1 | -1/+1 | |
| * | | | | | | Compute share permissions in the view | Vincent Petry | 2015-12-08 | 2 | -5/+7 | |
* | | | | | | | Merge pull request #21043 from owncloud/add-php-doc | Thomas Müller | 2015-12-09 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Add type description | Lukas Reschke | 2015-12-08 | 1 | -0/+2 | |
| | |_|/ / / | |/| | | | | ||||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-09 | 2 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #21031 from owncloud/sanitize-findAppInDirectories | Thomas Müller | 2015-12-08 | 1 | -1/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Sanitize the appId passed to `findAppInDirectories` | Lukas Reschke | 2015-12-08 | 1 | -1/+5 | |
* | | | | | | Merge pull request #21030 from owncloud/querybuilder-new-features | Thomas Müller | 2015-12-08 | 3 | -2/+99 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a method to the get "to use" table and column name | Joas Schilling | 2015-12-08 | 3 | -2/+38 | |
| * | | | | | | Add select distinct to the query builder | Joas Schilling | 2015-12-08 | 2 | -0/+38 | |
| * | | | | | | Allow getting the last insert id without much hassle | Joas Schilling | 2015-12-08 | 2 | -0/+23 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #20786 from owncloud/systemtags-dav | Thomas Müller | 2015-12-08 | 3 | -4/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed system tags DAV and API and docs | Vincent Petry | 2015-12-04 | 3 | -4/+4 | |
| * | | | | | | Added dav endpoints for system tags | Vincent Petry | 2015-12-03 | 1 | -0/+4 | |
* | | | | | | | Merge pull request #21022 from owncloud/get-rid-of-by-reference | Thomas Müller | 2015-12-08 | 4 | -12/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML | Lukas Reschke | 2015-12-08 | 3 | -8/+8 | |
| * | | | | | | | Get rid of passing a reference | Lukas Reschke | 2015-12-08 | 1 | -4/+6 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Do not trust casting | Lukas Reschke | 2015-12-08 | 1 | -1/+1 | |
* | | | | | | | Remove unused repair steps | Lukas Reschke | 2015-12-08 | 2 | -85/+2 | |
* | | | | | | | Remove legacy check | Lukas Reschke | 2015-12-08 | 1 | -5/+0 | |
|/ / / / / / | ||||||
* | | | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-08 | 4 | -4/+14 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-whe... | Thomas Müller | 2015-12-07 | 1 | -0/+8 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Allow specifying a custom reset-password-url | Joas Schilling | 2015-12-07 | 1 | -3/+5 | |
| * | | | | Remove password reset when the user can not change the password | Joas Schilling | 2015-12-07 | 1 | -0/+6 | |
| | |_|/ | |/| | | ||||||
* | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 3 | -4/+0 | |
* | | | | Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten | Thomas Müller | 2015-12-07 | 1 | -3/+7 | |
|\ \ \ \ | ||||||
| * | | | | Do not overwrite the language when it's just missing for one app | Joas Schilling | 2015-12-07 | 1 | -3/+7 | |
| |/ / / | ||||||
* | | | | Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-share... | Thomas Müller | 2015-12-07 | 1 | -1/+3 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Allow sending a share email to multiple users | Joas Schilling | 2015-12-07 | 1 | -1/+3 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent | Thomas Müller | 2015-12-07 | 2 | -19/+12 | |
|\ \ \ | ||||||
| * | | | Remove OC_Util::getUrlContent and replace by proper usage of public interfaces | Morris Jobke | 2015-12-04 | 2 | -19/+12 | |
* | | | | Merge pull request #11131 from owncloud/use-phpini-wrapper | Thomas Müller | 2015-12-07 | 7 | -14/+16 | |
|\ \ \ \ | ||||||
| * | | | | Replace new occurences of ini_get with IniWrapper methods | Morris Jobke | 2015-11-23 | 4 | -7/+9 | |
| * | | | | Replacing ini_get instances with inigetwrapper usages | Clark Tomlinson | 2015-11-23 | 5 | -7/+7 | |
* | | | | | Merge pull request #20904 from owncloud/view-mime-filter | Thomas Müller | 2015-12-07 | 1 | -6/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix mimetype filter in getDirectoryContent | Robin Appelman | 2015-12-03 | 1 | -6/+2 | |
* | | | | | | Merge pull request #20949 from owncloud/fix_20892 | Thomas Müller | 2015-12-07 | 1 | -4/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [Sharing] Properly check if a group already has access | Roeland Jago Douma | 2015-12-04 | 1 | -4/+2 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #20957 from owncloud/use-correct-method-signature | Thomas Müller | 2015-12-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use correct method signature | Lukas Reschke | 2015-12-04 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry | Thomas Müller | 2015-12-07 | 2 | -32/+2 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | remove OC_App::getActiveNavigationEntry - not unsed anymore | Morris Jobke | 2015-12-04 | 1 | -14/+0 | |
| * | | | | | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App | Morris Jobke | 2015-12-04 | 2 | -18/+2 | |
| |/ / / / | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-07 | 2 | -0/+6 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-06 | 4 | -2/+14 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-05 | 8 | -8/+40 | |
|/ / / / |