aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1966 from nextcloud/fix-csrf-token-generationRoeland Jago Douma2016-11-021-3/+3
|\ | | | | Fix CSRF token generation / validation
| * Fix CSRF token generation / validationLeon Klingele2016-11-021-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-mailJoas Schilling2016-11-024-2/+88
|\ \ | |/ |/| New share provider: Share by mail
| * find and show share-by mail linksBjoern Schiessle2016-11-011-0/+10
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * send mail for share-by-mail sharesBjoern Schiessle2016-11-011-1/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add method to check if a share provider for a given type is loadedBjoern Schiessle2016-11-012-0/+22
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add share by mail share providerBjoern Schiessle2016-11-012-0/+52
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * introduce share by mail, ui partBjoern Schiessle2016-11-011-2/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | [tx-robot] updated from transifexNextcloud bot2016-11-022-0/+92
|/
* Merge pull request #339 from nextcloud/share-types-by-folderLukas Reschke2016-11-016-0/+97
|\ | | | | Add getShareTypesInFolder to optimize folder listening
| * Fix merging backend resultsRoeland Jago Douma2016-11-012-2/+11
| | | | | | | | | | | | | | | | * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Stricter signatureRoeland Jago Douma2016-10-314-6/+9
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add getShareTypesInFolder to optimize folder listeningRobin Appelman2016-10-316-0/+85
| | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com>
* | [tx-robot] updated from transifexNextcloud bot2016-11-014-12/+114
|/
* Merge pull request #1937 from nextcloud/ros-for-notification-messageRoeland Jago Douma2016-10-312-12/+76
|\ | | | | Allow rich object strings in messages as well
| * Type hints already make sure it is an arrayJoas Schilling2016-10-311-16/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow rich object strings in messages as wellJoas Schilling2016-10-312-0/+74
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1952 from nextcloud/deprecated_backgroudjobLukas Reschke2016-10-313-112/+0
|\ \ | |/ |/| Cleanup deprecated backgroudjob functions
| * Cleanup usagesRoeland Jago Douma2016-10-292-20/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Removed depreacted functions (since 6.0)Roeland Jago Douma2016-10-291-92/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-10-312-0/+74
| |
* | [tx-robot] updated from transifexNextcloud bot2016-10-302-0/+94
|/
* Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10nLukas Reschke2016-10-297-351/+12
|\ | | | | Move away from legacy OC_L10N
| * Remove legacy l10nRoeland Jago Douma2016-10-281-343/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix more testsRoeland Jago Douma2016-10-281-3/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move away from OC_L10NRoeland Jago Douma2016-10-285-5/+9
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-10-292-12/+132
|/
* Proper DI of configRoeland Jago Douma2016-10-282-15/+15
| | | | | | * Fixed comments Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Use callForSeenUsers for avatar migrationMorris Jobke2016-10-281-24/+22
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* introduce callForSeenUsers and countSeenUsers (#26361)Jörn Friedrich Dreyer2016-10-284-56/+134
| | | | | | | | | | * introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0
* [tx-robot] updated from transifexNextcloud bot2016-10-282-0/+92
|
* Merge pull request #1800 from nextcloud/nextcloud-rich-object-stringsMorris Jobke2016-10-2710-2/+506
|\ | | | | Nextcloud rich object strings
| * dump autoloaderMorris Jobke2016-10-242-0/+6
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Move federated share notifications to ROSJoas Schilling2016-10-201-0/+19
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow rich object subjects for NotificationsJoas Schilling2016-10-203-2/+88
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add Rich Object Definitions and a validatorJoas Schilling2016-10-205-0/+393
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #1929 from nextcloud/share_email_to_OCSLukas Reschke2016-10-271-80/+0
|\ \ | | | | | | Remove notify recipient function
| * | Remove internal share mail functionRoeland Jago Douma2016-10-261-80/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1930 from nextcloud/fix_avatars_exifLukas Reschke2016-10-271-0/+27
|\ \ \ | | | | | | | | Fix avatar on exif rotated images
| * | | Fix avatar on exif rotated imagesRoeland Jago Douma2016-10-261-0/+27
| |/ / | | | | | | | | | | | | | | | Fixes #1928 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / [tx-robot] updated from transifexNextcloud bot2016-10-278-0/+300
|/ /
* | Merge pull request #1920 from ↵Roeland Jago Douma2016-10-263-4/+4
|\ \ | | | | | | | | | | | | nextcloud/legacy-pages-should-also-receive-the-nonce Add nonce also to legacy CSP
| * | Identify Chromium as ChromeJoas Schilling2016-10-262-3/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add nonce also to legacy CSPLukas Reschke2016-10-261-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 Jobke2016-10-264-0/+134
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid
| * | | resolve displayname via manager and registerable resolversArthur Schiwon2016-10-192-0/+75
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | move mention extraction to (I)Comment and report mentions via DAVArthur Schiwon2016-10-192-0/+59
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #1914 from nextcloud/downstream-26468Morris Jobke2016-10-261-6/+1
|\ \ \ \ | |_|/ / |/| | | Remove all unneeded set_include_path()
| * | | Remove all unneeded set_include_path()Thomas Müller2016-10-251-6/+1
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-2626-26/+30
| | | |