Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use new appstore API | Lukas Reschke | 2016-10-31 | 30 | -2193/+1243 |
| | | | | | | This change introduces the new appstore API in Nextcloud. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | Merge pull request #1961 from nextcloud/configphp_begone | Roeland Jago Douma | 2016-10-31 | 1 | -207/+0 |
|\ | | | | | Remove config.php for oc.js | ||||
| * | Remove config.php for oc.js | Roeland Jago Douma | 2016-10-31 | 1 | -207/+0 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #1937 from nextcloud/ros-for-notification-message | Roeland Jago Douma | 2016-10-31 | 2 | -12/+76 |
|\ \ | | | | | | | Allow rich object strings in messages as well | ||||
| * | | Type hints already make sure it is an array | Joas Schilling | 2016-10-31 | 1 | -16/+6 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Allow rich object strings in messages as well | Joas Schilling | 2016-10-31 | 2 | -0/+74 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #1952 from nextcloud/deprecated_backgroudjob | Lukas Reschke | 2016-10-31 | 3 | -112/+0 |
|\ \ \ | |_|/ |/| | | Cleanup deprecated backgroudjob functions | ||||
| * | | Cleanup usages | Roeland Jago Douma | 2016-10-29 | 2 | -20/+0 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Removed depreacted functions (since 6.0) | Roeland Jago Douma | 2016-10-29 | 1 | -92/+0 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #1935 from nextcloud/downstream-ldap-26 | Lukas Reschke | 2016-10-31 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Add prefix to the connection | ||||
| * | | | Add prefix to the connection | Juan Pablo Villafáñez | 2016-10-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | Merge pull request #1903 from nextcloud/fix-log-in-button | Lukas Reschke | 2016-10-31 | 2 | -10/+3 |
|\ \ \ \ | |_|_|/ |/| | | | remove slight transparency of primary action button, ref #1615 | ||||
| * | | | also fix log in button confirm arrow when theming, fix #1615 | Jan-Christoph Borchardt | 2016-10-25 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | | remove slight transparency of primary action button, ref #1615 | Jan-Christoph Borchardt | 2016-10-25 | 2 | -10/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-31 | 34 | -22/+198 |
| | | | | |||||
* | | | | Merge pull request #1955 from nextcloud/issue_#1776 | Marius Blüm | 2016-10-30 | 3 | -6/+13 |
|\ \ \ \ | | | | | | | | | | | Issue-1776: Add unshare function to 3-dot menu. | ||||
| * | | | | Issue-1776: Add unshare function to 3-dot menu. | Julia Bode | 2016-10-29 | 3 | -6/+13 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julia Bode <julia.bode@lulisaur.us> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-30 | 20 | -2/+172 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n | Lukas Reschke | 2016-10-29 | 30 | -527/+47 |
|\ \ \ \ | |/ / / |/| | | | Move away from legacy OC_L10N | ||||
| * | | | Use OCP\\IL10N in tests too | Morris Jobke | 2016-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Remove legacy l10n | Roeland Jago Douma | 2016-10-28 | 1 | -343/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Fix more tests | Roeland Jago Douma | 2016-10-28 | 6 | -161/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Move away from OC_L10N | Roeland Jago Douma | 2016-10-28 | 22 | -22/+26 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-29 | 20 | -20/+266 |
| | | | | |||||
* | | | | Merge pull request #1949 from nextcloud/disable-codecov-comments | Christoph Wurst | 2016-10-29 | 1 | -3/+1 |
|\ \ \ \ | | | | | | | | | | | Disable codecov comments | ||||
| * | | | | Disable codecov comments | Morris Jobke | 2016-10-29 | 1 | -3/+1 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities | Morris Jobke | 2016-10-28 | 1 | -0/+25 |
|\ \ \ \ | |/ / / |/| | | | Fix comment mentions in activities | ||||
| * | | | Fix comment mentions in activities | Joas Schilling | 2016-10-28 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #1888 from nextcloud/downstream-26361 | Joas Schilling | 2016-10-28 | 15 | -121/+292 |
|\ \ \ \ | | | | | | | | | | | introduce callForSeenUsers and countSeenUsers | ||||
| * | | | | Proper DI of config | Roeland Jago Douma | 2016-10-28 | 7 | -46/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed comments Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Use callForSeenUsers for avatar migration | Morris Jobke | 2016-10-28 | 1 | -24/+22 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | introduce callForSeenUsers and countSeenUsers (#26361) | Jörn Friedrich Dreyer | 2016-10-28 | 10 | -65/+208 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0 | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-28 | 176 | -362/+738 |
| | | | | |||||
* | | | | Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings | Morris Jobke | 2016-10-27 | 14 | -37/+709 |
|\ \ \ \ | |_|_|/ |/| | | | Nextcloud rich object strings | ||||
| * | | | dump autoloader | Morris Jobke | 2016-10-24 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Move federated share notifications to ROS | Joas Schilling | 2016-10-20 | 3 | -6/+148 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Allow rich object subjects for Notifications | Joas Schilling | 2016-10-20 | 4 | -31/+109 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Add Rich Object Definitions and a validator | Joas Schilling | 2016-10-20 | 6 | -0/+446 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #1933 from spacegaier/patch-1 | Lukas Reschke | 2016-10-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Updated doc link version in default theme from 9 to 11 | ||||
| * | | | | Updated doc link version in default theme from 9 to 11 | Philip Allgaier | 2016-10-27 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1929 from nextcloud/share_email_to_OCS | Lukas Reschke | 2016-10-27 | 6 | -195/+0 |
|\ \ \ \ | | | | | | | | | | | Remove notify recipient function | ||||
| * | | | | Remove internal share mail function | Roeland Jago Douma | 2016-10-26 | 2 | -128/+0 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Remove notify recipient option | Roeland Jago Douma | 2016-10-26 | 4 | -67/+0 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #1930 from nextcloud/fix_avatars_exif | Lukas Reschke | 2016-10-27 | 2 | -0/+28 |
|\ \ \ \ | | | | | | | | | | | Fix avatar on exif rotated images | ||||
| * | | | | Fix avatar on exif rotated images | Roeland Jago Douma | 2016-10-26 | 2 | -0/+28 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Fixes #1928 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* / / / | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-27 | 36 | -44/+456 |
|/ / / | |||||
* | | | Merge pull request #1920 from ↵ | Roeland Jago Douma | 2016-10-26 | 4 | -4/+18 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/legacy-pages-should-also-receive-the-nonce Add nonce also to legacy CSP | ||||
| * | | | Identify Chromium as Chrome | Joas Schilling | 2016-10-26 | 3 | -3/+17 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Add nonce also to legacy CSP | Lukas Reschke | 2016-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pages that do not use the AppFramework have its CSP inherited from `\OC_Response::addSecurityHeaders`. While those are not many anymore, there are some examples such as the "Help" page. To stay completely backwards-compatible we should also add the nonce to the legacy CSP response. To test that open your browser console and open the help page. Without this you will get a JS error. With this you won't. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | | Merge pull request #1925 from ↵ | Joas Schilling | 2016-10-26 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-1874-allow-users-to-change-their-passwords-again Allow users to change their passwords again |