Commit Graph

35530 Commits

Author SHA1 Message Date
Joas Schilling 2c0b5dee19
Allow rich object strings in messages as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 10:37:37 +01:00
Lukas Reschke 85016977f4 Merge pull request #1935 from nextcloud/downstream-ldap-26
Add prefix to the connection
2016-10-31 09:27:09 +01:00
Lukas Reschke 230dca0065 Merge pull request #1903 from nextcloud/fix-log-in-button
remove slight transparency of primary action button, ref #1615
2016-10-31 08:51:09 +01:00
Nextcloud bot 6d2d069c17
[tx-robot] updated from transifex 2016-10-31 01:06:55 +00:00
Marius Blüm a08a4b5981 Merge pull request #1955 from nextcloud/issue_#1776
Issue-1776: Add unshare function to 3-dot menu.
2016-10-30 11:27:57 +01:00
Nextcloud bot 1187a8c183
[tx-robot] updated from transifex 2016-10-30 00:06:56 +00:00
pgys bd7abc2d0a restricted the height of the settings area in core/css/apps.css to max 80%
Signed-off-by: pgys <info@pexlab.space>
2016-10-29 17:50:51 +02:00
Julia Bode 2d91831b50 Issue-1776: Add unshare function to 3-dot menu.
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
2016-10-29 17:07:06 +02:00
Roeland Jago Douma e55e6f1f14
Cleanup usages
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-29 14:29:50 +02:00
Roeland Jago Douma d5159423cd
Removed depreacted functions (since 6.0)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-29 14:27:12 +02:00
Lukas Reschke e48fa1c337 Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n
Move away from legacy OC_L10N
2016-10-29 09:39:22 +02:00
Nextcloud bot 035890aeb1
[tx-robot] updated from transifex 2016-10-29 00:07:14 +00:00
Christoph Wurst 96c35d30c3 Merge pull request #1949 from nextcloud/disable-codecov-comments
Disable codecov comments
2016-10-29 01:04:59 +02:00
Morris Jobke b97d98e86c
Disable codecov comments
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-29 00:04:30 +02:00
Morris Jobke a78f6e9586
Use OCP\\IL10N in tests too
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-28 23:04:36 +02:00
Morris Jobke 48ce0ef19c Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities
Fix comment mentions in activities
2016-10-28 22:47:15 +02:00
Roeland Jago Douma 94d09141f8
Remove legacy l10n
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 22:16:33 +02:00
Roeland Jago Douma 83e7cfd13a
Fix more tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 22:16:28 +02:00
Roeland Jago Douma 740659a04c
Move away from OC_L10N
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 21:46:28 +02:00
Joas Schilling 286482656b
Fix comment mentions in activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-28 12:32:10 +02:00
Joas Schilling f2cae3cee1 Merge pull request #1888 from nextcloud/downstream-26361
introduce callForSeenUsers and countSeenUsers
2016-10-28 11:42:32 +02:00
Roeland Jago Douma f722640a32
Proper DI of config
* Fixed comments

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 10:13:35 +02:00
Morris Jobke e7ec4601a3
Use callForSeenUsers for avatar migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-28 08:44:05 +02:00
Jörn Friedrich Dreyer f8352fcb8d
introduce callForSeenUsers and countSeenUsers (#26361)
* introduce callForSeenUsers and countSeenUsers

* add tests

* oracle should support not null on clob

* since 9.2.0
2016-10-28 08:44:05 +02:00
Nextcloud bot ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00:00
Morris Jobke d4969abc9d Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings
Nextcloud rich object strings
2016-10-27 15:30:58 +02:00
Juan Pablo Villafáñez 1937e58ec0
Add prefix to the connection
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-27 13:08:09 +02:00
Lukas Reschke ba2b274fcc Merge pull request #1933 from spacegaier/patch-1
Updated doc link version in default theme from 9 to 11
2016-10-27 12:45:07 +02:00
Philip Allgaier 9ad735417f Updated doc link version in default theme from 9 to 11 2016-10-27 10:59:17 +02:00
Lukas Reschke 0a2e2f70f6 Merge pull request #1929 from nextcloud/share_email_to_OCS
Remove notify recipient function
2016-10-27 09:03:29 +02:00
Lukas Reschke 7cae758ef9 Merge pull request #1930 from nextcloud/fix_avatars_exif
Fix avatar on exif rotated images
2016-10-27 08:56:56 +02:00
Nextcloud bot 9984eba727
[tx-robot] updated from transifex 2016-10-27 00:07:01 +00:00
Roeland Jago Douma b05fe45d52
Fix avatar on exif rotated images
Fixes #1928

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-26 21:37:11 +02:00
Roeland Jago Douma b7046d390f
Remove internal share mail function
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-26 20:52:41 +02:00
Roeland Jago Douma 57e61250ac
Remove notify recipient option
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-26 20:52:36 +02:00
Roeland Jago Douma b98dfaccd9 Merge pull request #1920 from nextcloud/legacy-pages-should-also-receive-the-nonce
Add nonce also to legacy CSP
2016-10-26 16:41:34 +02:00
Joas Schilling cd12e2d20a Merge pull request #1925 from nextcloud/issue-1874-allow-users-to-change-their-passwords-again
Allow users to change their passwords again
2016-10-26 16:27:41 +02:00
Joas Schilling 8b15669677
Allow users to change their passwords again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-26 14:04:38 +02:00
Morris Jobke cde7f535bd Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-mentions
comment mentions: show displayname not uid
2016-10-26 14:02:49 +02:00
Morris Jobke b358b4eebc Merge pull request #1923 from nextcloud/fix-template-url
Fix issue template url
2016-10-26 13:58:14 +02:00
blizzz 2fa8b7f280 … and the raw version of it 2016-10-26 13:38:26 +02:00
blizzz b91b6c0136 Fix issue template url
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-26 13:36:23 +02:00
Morris Jobke ffb0e91b60 Merge pull request #1907 from nextcloud/downstream-26164
Highlight files and update storage stats at end of upload (#26164)
2016-10-26 13:17:35 +02:00
Morris Jobke 995335b54d Merge pull request #1921 from nextcloud/ignore-htaccess
Ignore .htaccess So no one commits the crappy 403 and 404 anymore
2016-10-26 13:16:50 +02:00
Joas Schilling c20ab0049f
Identify Chromium as Chrome
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-26 12:07:10 +02:00
Joas Schilling 96a474c4e5
So no one commits the crappy 403 and 404 anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-26 10:47:18 +02:00
Morris Jobke 363618249d Merge pull request #1355 from nextcloud/apps_flexbox
Use flexbox on app page
2016-10-26 10:28:02 +02:00
Morris Jobke 0b430a82d4 Merge pull request #1914 from nextcloud/downstream-26468
Remove all unneeded set_include_path()
2016-10-26 09:55:56 +02:00
Lukas Reschke fdcb8edd78
Add nonce also to legacy CSP
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>
2016-10-26 09:41:18 +02:00
Nextcloud bot a973c1bfb9
[tx-robot] updated from transifex 2016-10-26 00:07:12 +00:00