mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,142 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

36142 Commits

Author SHA1 Message Date
Lukas Reschke aa30c4cd80 Merge pull request #2240 from nextcloud/daita-encryption-init_on_master_key 
init Session/privateKeys on Master Key
 2016-11-23 15:19:24 +01:00
Morris Jobke 25f519c855 Merge pull request #2266 from nextcloud/avatar_image 
VCARDS don't hold binary data
 2016-11-23 14:49:32 +01:00
Robin Appelman 3bb3296c53
make the share icon in the filelist visible again 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-23 14:44:53 +01:00
Lukas Reschke 0adc688c84 Merge pull request #2275 from nextcloud/harden-cookies 
Harden cookies more appropriate
 2016-11-23 14:34:24 +01:00
Lukas Reschke 2eca9cc384 Merge pull request #2262 from nextcloud/specify-parameters-on-public-download 
Specify the parameters on public download
 2016-11-23 14:02:38 +01:00
Roeland Jago Douma e9f98fd5a9
VCARDS don't hold binary data 
* We need to base64 encode the avatar!
* Switched to vcard v4
* User proper data uri

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-23 13:30:32 +01:00
Lukas Reschke a05b8b7953
Harden cookies more appropriate 
This adds the __Host- prefix to the same-site cookies. This is a small but yet nice security hardening.

See https://googlechrome.github.io/samples/cookie-prefixes/ for the implications.

Fixes https://github.com/nextcloud/server/issues/1412

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-23 12:53:44 +01:00
Bjoern Schiessle 8a401ee156
check if session is initialized 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-23 12:20:43 +01:00
Lukas Reschke f692ea34f1 Merge pull request #2263 from nextcloud/remove91_migration 
Remove migration steps in app dav
 2016-11-23 12:18:06 +01:00
Lukas Reschke 10cc849dbc Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-activities-only 
Only do stuff when its a remote-share activity
 2016-11-23 12:16:55 +01:00
Joas Schilling d2489ebee4
Adjust tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-23 11:31:35 +01:00
Joas Schilling bfecdd4422
Use the comment icon for the notifications 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-23 11:19:44 +01:00
Joas Schilling 56cfd0a6e4
Set the rich object string for comment notifications 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-23 11:19:41 +01:00
Joas Schilling f0670aadbe Merge pull request #2239 from nextcloud/cleanup-settings-application-again 
Cleanup settings application again
 2016-11-23 11:07:10 +01:00
Joas Schilling a36d26950e
Only do stuff when its a remote-share activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 22:46:18 +01:00
Joas Schilling 7b0b7e801f Merge pull request #2250 from nextcloud/check-if-data-is-defined 
Check if data is defined
 2016-11-22 20:31:32 +01:00
Thomas Müller 181af830fd
Remove 9.1 migration steps in app dav (#25654) 2016-11-22 20:17:05 +01:00
Joas Schilling e9336dddd5
Specify the parameters on public download 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 20:14:42 +01:00
Morris Jobke ca3b67703c Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-field 
Remove superfluous email input field
 2016-11-22 19:21:22 +01:00
Lukas Reschke 623c02fe6e
Remove superfluous email input field 
That field is already there and looking at the code this seems to have been missed on a rebase.

Fixes https://github.com/nextcloud/server/issues/2222

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 18:29:09 +01:00
Lukas Reschke f4470b6861 Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again 
Use the display name for files activities again
 2016-11-22 18:25:52 +01:00
Lukas Reschke e827be759d
Check if data is defined 
Otherwise when adding a user as subadmin this would throw the following JS error:

```
users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 18:23:48 +01:00
Lukas Reschke 717fd9fdd6 Merge pull request #2229 from nextcloud/select2-fix-bis 
Select2 fix bis
 2016-11-22 17:50:53 +01:00
Jan-Christoph Borchardt 298cd0f1f8 use ? instead of X for avatar name fallback 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-22 17:08:28 +01:00
Lukas Reschke 3e7bbaa2b8 Merge pull request #2241 from nextcloud/make-it-a-beta 
Make it 11.0 beta
 2016-11-22 17:04:15 +01:00
Morris Jobke f6e7269628
document new variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-22 16:55:28 +01:00
Joas Schilling e1feb72583
Use the display name for files activities again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 16:39:29 +01:00
Jan-Christoph Borchardt 82efed636f fix wording of File drop, ref #2207 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-22 16:04:14 +01:00
Jan-Christoph Borchardt 56881433c0 show installation spinner correctly, fix #2129 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-22 15:58:00 +01:00
Lukas Reschke c778e5d15e
Make it 11.0 beta 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 15:55:59 +01:00
Joas Schilling e0d01e4768 Merge pull request #2238 from nextcloud/fix_systemtags 
Fix undefined systemtags stuff
 2016-11-22 15:53:15 +01:00
Maxence Lange 558a934842 init Session/privateKeys on Master Key 
I can't find another way to init the session ...
 2016-11-22 13:19:42 -01:00
Joas Schilling 7f1bf10044
Clean up the Application class again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-22 15:04:03 +01:00
Roeland Jago Douma 9619f49ba4
Fix undefined systemtags stuff 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-22 14:59:51 +01:00
Joas Schilling b5fab4ed9c Merge pull request #2234 from nextcloud/add-subadmin-middleware-back 
Add SubAdminMiddleware back
 2016-11-22 14:46:43 +01:00
Lukas Reschke 54f80ce6d9
Add SubAdminMiddleware back 
Removed by mistake in #1946

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 13:33:23 +01:00
Lukas Reschke 7eaaffeee0
Update link to the docs to 11 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 13:29:24 +01:00
Roeland Jago Douma df215625f1 Merge pull request #1972 from nextcloud/invalid-files-from-scanner 
Make sure we don't scan files that can not be accessed
 2016-11-22 12:55:54 +01:00
Julius Haertl 6c4664bc82
Workaround for PHP bug when calling imagescale 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-22 12:12:59 +01:00
Joas Schilling b8732a1a53 Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api 
Update systemtags activity to new API
 2016-11-22 11:05:06 +01:00
Morris Jobke 3fa81d6c35
Fix select2 input on retina - fixes #2226 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-22 10:49:29 +01:00
John Molakvoæ 6bcb6e08be
Fix systemtagsfilelist unwanted margin and clean aera a bit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-22 10:49:24 +01:00
John Molakvoæ d89143524b
Remove unwanted padding 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-22 10:49:11 +01:00
Roeland Jago Douma 08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update 
Move file sharing activities to the new API
 2016-11-22 10:19:15 +01:00
Roeland Jago Douma 9c52f16dbb Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element 
Use app ID instead of object
 2016-11-22 10:06:33 +01:00
Morris Jobke a02d0975dd Merge pull request #2154 from nextcloud/comments-activities-update 
Move comments activities to the new API
 2016-11-22 09:56:22 +01:00
Nextcloud bot b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke 8ee11956da
Use app ID instead of object 
Fixes several error messages when installing an app from the appstore, including:

```
Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661
Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81
trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 00:24:23 +01:00
Lukas Reschke 2786877013 Merge pull request #2215 from nextcloud/add-setup-page-integration-test 
Add integration test for web based installer
 2016-11-21 23:26:19 +01:00
Lukas Reschke 91f735acf3
Make Christoph happier 
Apparently this failed for him as per https://github.com/nextcloud/server/pull/2224#issuecomment-262085537

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 23:21:53 +01:00