Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1966 from nextcloud/fix-csrf-token-generation | Roeland Jago Douma | 2016-11-02 | 1 | -3/+3 |
|\ | | | | | Fix CSRF token generation / validation | ||||
| * | Fix CSRF token generation / validation | Leon Klingele | 2016-11-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | Operate on raw bytes instead of base64-encoded strings. Issue was introduced in a977465 Signed-off-by: Leon Klingele <git@leonklingele.de> | ||||
* | | Merge pull request #657 from nextcloud/share-by-mail | Joas Schilling | 2016-11-02 | 4 | -2/+88 |
|\ \ | |/ |/| | New share provider: Share by mail | ||||
| * | find and show share-by mail links | Bjoern Schiessle | 2016-11-01 | 1 | -0/+10 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | send mail for share-by-mail shares | Bjoern Schiessle | 2016-11-01 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | add method to check if a share provider for a given type is loaded | Bjoern Schiessle | 2016-11-01 | 2 | -0/+22 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | add share by mail share provider | Bjoern Schiessle | 2016-11-01 | 2 | -0/+52 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | introduce share by mail, ui part | Bjoern Schiessle | 2016-11-01 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-02 | 2 | -0/+92 |
|/ | |||||
* | Merge pull request #339 from nextcloud/share-types-by-folder | Lukas Reschke | 2016-11-01 | 6 | -0/+97 |
|\ | | | | | Add getShareTypesInFolder to optimize folder listening | ||||
| * | Fix merging backend results | Roeland Jago Douma | 2016-11-01 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Stricter signature | Roeland Jago Douma | 2016-10-31 | 4 | -6/+9 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Add getShareTypesInFolder to optimize folder listening | Robin Appelman | 2016-10-31 | 6 | -0/+85 |
| | | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-01 | 4 | -12/+114 |
|/ | |||||
* | 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> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-31 | 2 | -0/+74 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-30 | 2 | -0/+94 |
|/ | |||||
* | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n | Lukas Reschke | 2016-10-29 | 7 | -351/+12 |
|\ | | | | | Move away from legacy OC_L10N | ||||
| * | 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 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | Move away from OC_L10N | Roeland Jago Douma | 2016-10-28 | 5 | -5/+9 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-29 | 2 | -12/+132 |
|/ | |||||
* | Proper DI of config | Roeland Jago Douma | 2016-10-28 | 2 | -15/+15 |
| | | | | | | * 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 | 4 | -56/+134 |
| | | | | | | | | | | * 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 | 2 | -0/+92 |
| | |||||
* | Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings | Morris Jobke | 2016-10-27 | 10 | -2/+506 |
|\ | | | | | 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 | 1 | -0/+19 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Allow rich object subjects for Notifications | Joas Schilling | 2016-10-20 | 3 | -2/+88 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Add Rich Object Definitions and a validator | Joas Schilling | 2016-10-20 | 5 | -0/+393 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #1929 from nextcloud/share_email_to_OCS | Lukas Reschke | 2016-10-27 | 1 | -80/+0 |
|\ \ | | | | | | | Remove notify recipient function | ||||
| * | | Remove internal share mail function | Roeland Jago Douma | 2016-10-26 | 1 | -80/+0 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #1930 from nextcloud/fix_avatars_exif | Lukas Reschke | 2016-10-27 | 1 | -0/+27 |
|\ \ \ | | | | | | | | | Fix avatar on exif rotated images | ||||
| * | | | Fix avatar on exif rotated images | Roeland Jago Douma | 2016-10-26 | 1 | -0/+27 |
| |/ / | | | | | | | | | | | | | | | | Fixes #1928 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* / / | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-27 | 8 | -0/+300 |
|/ / | |||||
* | | Merge pull request #1920 from ↵ | Roeland Jago Douma | 2016-10-26 | 3 | -4/+4 |
|\ \ | | | | | | | | | | | | | nextcloud/legacy-pages-should-also-receive-the-nonce Add nonce also to legacy CSP | ||||
| * | | Identify Chromium as Chrome | Joas Schilling | 2016-10-26 | 2 | -3/+3 |
| | | | | | | | | | | | | 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 #1738 from ↵ | Morris Jobke | 2016-10-26 | 4 | -0/+134 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid | ||||
| * | | | resolve displayname via manager and registerable resolvers | Arthur Schiwon | 2016-10-19 | 2 | -0/+75 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | move mention extraction to (I)Comment and report mentions via DAV | Arthur Schiwon | 2016-10-19 | 2 | -0/+59 |
| | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | Merge pull request #1914 from nextcloud/downstream-26468 | Morris Jobke | 2016-10-26 | 1 | -6/+1 |
|\ \ \ \ | |_|/ / |/| | | | Remove all unneeded set_include_path() | ||||
| * | | | Remove all unneeded set_include_path() | Thomas Müller | 2016-10-25 | 1 | -6/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-26 | 26 | -26/+30 |
| | | | |