Граф коммитов

35252 Коммитов

Автор SHA1 Сообщение Дата
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
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
Morris Jobke 9a70c137d2 Merge pull request #1917 from nextcloud/ocjs_inline
Inline oc.js when possible!
2016-10-26 00:20:27 +02:00
Lukas Reschke 015affb082
Missing returns + autoloader file
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-25 22:13:09 +02:00
Roeland Jago Douma 1b6ba5ad32 Merge pull request #1911 from nextcloud/downstream-26477
Fix malformed attribute in files app
2016-10-25 22:04:43 +02:00
Roeland Jago Douma d89c1a49c1 Merge pull request #1913 from nextcloud/downstream-26441
Require to use at least desktop client 2.0 by default
2016-10-25 22:04:15 +02:00
Roeland Jago Douma 6dbe417c51
Inlince oc.js if possible!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-25 22:03:18 +02:00
Roeland Jago Douma e351ba56f1
Move browserSupportsCspV3 to CSPNonceManager
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-25 22:03:10 +02:00
Roeland Jago Douma d5589a15d5
Move oc.js to a proper class
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-25 22:03:02 +02:00
Lukas Reschke 35c7ecef6a Merge pull request #1910 from nextcloud/ignore-build-bin
Add build/bin to gitignore
2016-10-25 19:37:39 +02:00
Lukas Reschke 08268bca39 Merge pull request #1891 from nextcloud/downstream-26430
add upgrade command before repair, handle NeedsUpgradeException better
2016-10-25 18:42:44 +02:00
Arthur Schiwon b12b52b73b
fix JS test and introduce tests for rendering mentions to displaynames
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-25 18:33:59 +02:00
Thomas Müller 748f18f34e
Remove all unneeded set_include_path() 2016-10-25 18:08:54 +02:00
Felix Epp e169bb0636 Limit to apps list, add proper flex attributes
Let app-name headline break, increase padding on the right for more visual clearance.
Make experimental header full width

Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-10-25 18:04:20 +02:00
Thomas Müller 1f90949e66
Set 2.0.0 as minimum requirement for the desktop client in config.sample.php 2016-10-25 18:03:19 +02:00
Thomas Müller 9df3869bfc
Fix unit tests for BlockLegacyClientPlugin 2016-10-25 18:03:10 +02:00
Thomas Müller 1c39b30d50
Require to use at least desktop client 2.0 by default 2016-10-25 18:01:25 +02:00
Morris Jobke 097a9ec8b0 Merge pull request #1878 from nextcloud/downstream-25936
Adjust unit tests to upstream
2016-10-25 17:59:01 +02:00
Morris Jobke fa4bf7b0b0 Merge pull request #1906 from nextcloud/downstream-26460
Remove any detailed information about the exception in the browser er…
2016-10-25 17:58:19 +02:00
Vincent Petry e456df14ab
Fix malformed attribute in files app 2016-10-25 17:32:59 +02:00
Felix A. Epp 711bc4f3d6 Add build/bin to gitignore
When phantomjs and karma are not installed globally, they are installed into this folder.

Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-10-25 16:52:54 +02:00
Vincent Petry 50b8221255
Highlight files and update storage stats at end of upload (#26164)
Properly trigger the "stop" even from the uploader.
Also update storage stats at the end of all uploads instead of for each
upload.
2016-10-25 14:51:44 +02:00
Thomas Müller 726994ecae
Remove any detailed information about the exception in the browser error plugin 2016-10-25 14:47:33 +02:00
Morris Jobke 89574367bc Merge pull request #1871 from nextcloud/use-csp-nonces
Use CSP nonces
2016-10-25 14:46:00 +02:00
Morris Jobke 27ba46c40e Merge pull request #1890 from nextcloud/downstream-25428
fixing php 32 bit (arm) filemtime on large file issue (#18971) (#25428)
2016-10-25 14:44:27 +02:00
Morris Jobke 01a85a98f2 Merge pull request #1876 from nextcloud/shareesAPI_email
Add ShareesAPI E-mail search
2016-10-25 13:53:59 +02:00
Morris Jobke c0adc3c2cf Merge pull request #1883 from nextcloud/downstream-26145
Storage 503 message improvements
2016-10-25 13:19:46 +02:00
Lukas Reschke 324e5b02ba Merge pull request #1902 from nextcloud/fix-largefile-helper-not-existent
Remove not existent function call
2016-10-25 12:25:41 +02:00