Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #10145 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/... | Roeland Jago Douma | 2018-07-09 | 2 | -119/+116 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Bump webpack from 4.14.0 to 4.15.1 in /apps/oauth2 | dependabot[bot] | 2018-07-08 | 2 | -119/+116 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #10147 from nextcloud/dependabot/npm_and_yarn/apps/accessi... | Roeland Jago Douma | 2018-07-09 | 2 | -993/+32 | |
|\ \ \ \ \ | ||||||
| * | | | | | Bump css-loader from 0.28.11 to 1.0.0 in /apps/accessibility | dependabot[bot] | 2018-07-08 | 2 | -993/+32 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #10146 from nextcloud/dependabot/npm_and_yarn/settings/css... | Roeland Jago Douma | 2018-07-09 | 2 | -1002/+35 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Bump css-loader from 0.28.11 to 1.0.0 in /settings | dependabot[bot] | 2018-07-08 | 2 | -1002/+35 | |
|/ / / / | ||||||
* | | | | Merge pull request #10116 from nextcloud/lock-negative | Morris Jobke | 2018-07-06 | 2 | -2/+20 | |
|\ \ \ \ | ||||||
| * | | | | prevent lock values from going negative with memcache backend | Robin Appelman | 2018-07-05 | 2 | -2/+20 | |
* | | | | | Merge pull request #10130 from nextcloud/3rdparty/noid/symfony-3.4.12 | Roeland Jago Douma | 2018-07-06 | 1 | -0/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | [3rdparty] Bump symfony depts to 3.4.12 | Roeland Jago Douma | 2018-07-06 | 1 | -0/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer | Joas Schilling | 2018-07-06 | 10 | -66/+85 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add warning to setup checks if the default mailer is still php | Roeland Jago Douma | 2018-07-04 | 3 | -1/+44 | |
| * | | | | | Fix settings tests | Roeland Jago Douma | 2018-07-04 | 1 | -2/+2 | |
| * | | | | | Swift to \Swift_Mailer as abstraction | Roeland Jago Douma | 2018-07-04 | 2 | -33/+21 | |
| * | | | | | Make swift 6 compatible | Roeland Jago Douma | 2018-07-04 | 1 | -26/+16 | |
| * | | | | | Kill php mail from settings | Roeland Jago Douma | 2018-07-04 | 3 | -9/+7 | |
| * | | | | | [3rdparty] Bump swiftmailer 6.0.2 | Roeland Jago Douma | 2018-07-04 | 1 | -0/+0 | |
* | | | | | | Merge pull request #10128 from nextcloud/fix/noid/add_locale_to_templates | Morris Jobke | 2018-07-06 | 3 | -3/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add locale to templates | Roeland Jago Douma | 2018-07-06 | 3 | -3/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #10119 from nextcloud/bugfix/noid/fix-remnants-of-refactoring | Roeland Jago Douma | 2018-07-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Fix remnants of refactoring | Morris Jobke | 2018-07-05 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9909 from nextcloud/feature/2192/allow_group_share_undele... | Morris Jobke | 2018-07-05 | 18 | -18/+443 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Fixed jsunit | John Molakvoæ (skjnldsv) | 2018-07-05 | 1 | -2/+2 | |
| * | | | | Fix exception | Roeland Jago Douma | 2018-07-05 | 1 | -0/+1 | |
| * | | | | Fix tests | Roeland Jago Douma | 2018-07-05 | 1 | -0/+15 | |
| * | | | | Fix PHPDoc | Morris Jobke | 2018-07-05 | 1 | -1/+1 | |
| * | | | | Always show menu | John Molakvoæ (skjnldsv) | 2018-07-05 | 1 | -13/+11 | |
| * | | | | Disable sidebar on deleted share | John Molakvoæ (skjnldsv) | 2018-07-05 | 4 | -9/+23 | |
| * | | | | Js magic for deleted shares | John Molakvoæ (skjnldsv) | 2018-07-05 | 7 | -19/+175 | |
| * | | | | getDeletedSharedWith method | John Molakvoæ (skjnldsv) | 2018-07-05 | 3 | -11/+34 | |
| * | | | | Add API to undelete delete group shares | Roeland Jago Douma | 2018-07-05 | 10 | -0/+218 | |
|/ / / / | ||||||
* | | | | Merge pull request #10103 from nextcloud/bugfix/9767/apps-management-issues | Morris Jobke | 2018-07-05 | 10 | -29/+56 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Update settings js | Julius Härtl | 2018-07-04 | 2 | -3/+3 | |
| * | | | Fix displaying errors | Julius Härtl | 2018-07-04 | 2 | -8/+16 | |
| * | | | Hide uninstalled apps when removing them | Julius Härtl | 2018-07-04 | 2 | -1/+2 | |
| * | | | Add transition when enabling/disabling apps | Julius Härtl | 2018-07-04 | 2 | -14/+24 | |
| * | | | Fix invalid limit parameter when fetching groups | Julius Härtl | 2018-07-04 | 4 | -3/+11 | |
|/ / / | ||||||
* | | | Merge pull request #10083 from nextcloud/fix/noid/ldap-unsupported-avatar-format | blizzz | 2018-07-04 | 4 | -1039/+674 | |
|\ \ \ | ||||||
| * | | | let user set avatar in nextcloud von LDAP provides invalid image data | Arthur Schiwon | 2018-07-03 | 4 | -13/+152 | |
| * | | | Iron User_LDAP tests | Arthur Schiwon | 2018-07-03 | 2 | -1029/+525 | |
* | | | | Merge pull request #10102 from nextcloud/bugfix/noid/fix-integration-tests-fe... | Morris Jobke | 2018-07-04 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix integration tests for Federation 2.0 | Morris Jobke | 2018-07-04 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #10101 from nextcloud/papercut/10094/oauth_table | Morris Jobke | 2018-07-04 | 4 | -7/+12 | |
|\ \ \ \ | ||||||
| * | | | | Do not show OAuth2 table if it is empty | Roeland Jago Douma | 2018-07-04 | 4 | -7/+12 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #10065 from nextcloud/rakekniven-patch-1 | Roeland Jago Douma | 2018-07-04 | 2 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Update SettingsControllerTest.php | rakekniven | 2018-06-30 | 1 | -1/+1 | |
| * | | | | Update SettingsController.php | rakekniven | 2018-06-30 | 1 | -1/+1 | |
* | | | | | Merge pull request #9345 from nextcloud/federation20 | Morris Jobke | 2018-07-03 | 51 | -667/+4356 | |
|\ \ \ \ \ | ||||||
| * | | | | | cache results from ocm end-point discovery | Bjoern Schiessle | 2018-07-02 | 1 | -0/+11 | |
| * | | | | | remove unused code | Bjoern Schiessle | 2018-07-02 | 1 | -24/+0 |