34849f7bd3
fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 18:02:23 +01:00
59db9fada2
Merge pull request #2281 from nextcloud/fix-translation
...
Fix language typo
2016-11-23 17:53:21 +01:00
5473475fa7
Merge pull request #2232 from nextcloud/imagescale-fix
...
Workaround for PHP bug when calling imagescale
2016-11-23 17:45:59 +01:00
14f01dbe33
Fix language typo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
6d92550772
Merge pull request #2278 from nextcloud/filelist-share-visible
...
make the share icon in the filelist visible again
2016-11-23 16:40:10 +01:00
e03512d4bc
Merge pull request #2280 from nextcloud/do_not_escape_sharees
...
Do not escape sharees
2016-11-23 16:40:01 +01:00
6281607d7a
improved style of shared entry
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-23 15:25:48 +01:00
9394713e72
Do not escape sharees
...
Fixes #2253
Do not escape special characters else it will look very strange.
2016-11-23 15:22:36 +01:00
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
25f519c855
Merge pull request #2266 from nextcloud/avatar_image
...
VCARDS don't hold binary data
2016-11-23 14:49:32 +01:00
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
0adc688c84
Merge pull request #2275 from nextcloud/harden-cookies
...
Harden cookies more appropriate
2016-11-23 14:34:24 +01:00
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
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
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
8a401ee156
check if session is initialized
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 12:20:43 +01:00
f692ea34f1
Merge pull request #2263 from nextcloud/remove91_migration
...
Remove migration steps in app dav
2016-11-23 12:18:06 +01:00
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
d2489ebee4
Adjust tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:31:35 +01:00
bfecdd4422
Use the comment icon for the notifications
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 11:19:44 +01:00
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
f0670aadbe
Merge pull request #2239 from nextcloud/cleanup-settings-application-again
...
Cleanup settings application again
2016-11-23 11:07:10 +01:00
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
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
181af830fd
Remove 9.1 migration steps in app dav ( #25654 )
2016-11-22 20:17:05 +01:00
e9336dddd5
Specify the parameters on public download
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
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
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
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
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
717fd9fdd6
Merge pull request #2229 from nextcloud/select2-fix-bis
...
Select2 fix bis
2016-11-22 17:50:53 +01:00
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
3e7bbaa2b8
Merge pull request #2241 from nextcloud/make-it-a-beta
...
Make it 11.0 beta
2016-11-22 17:04:15 +01:00
f6e7269628
document new variable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 16:55:28 +01:00
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
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
56881433c0
show installation spinner correctly, fix #2129
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-22 15:58:00 +01:00
c778e5d15e
Make it 11.0 beta
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 15:55:59 +01:00
e0d01e4768
Merge pull request #2238 from nextcloud/fix_systemtags
...
Fix undefined systemtags stuff
2016-11-22 15:53:15 +01:00
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
7f1bf10044
Clean up the Application class again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 15:04:03 +01:00
9619f49ba4
Fix undefined systemtags stuff
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-22 14:59:51 +01:00
b5fab4ed9c
Merge pull request #2234 from nextcloud/add-subadmin-middleware-back
...
Add SubAdminMiddleware back
2016-11-22 14:46:43 +01:00
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
7eaaffeee0
Update link to the docs to 11
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 13:29:24 +01:00
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
6c4664bc82
Workaround for PHP bug when calling imagescale
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-22 12:12:59 +01:00
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
3fa81d6c35
Fix select2 input on retina - fixes #2226
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 10:49:29 +01:00
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
Morris Jobke
Lukas Reschke
Joas Schilling
Roeland Jago Douma
Robin Appelman
Bjoern Schiessle
Thomas Müller
Jan-Christoph Borchardt
Maxence Lange
Roeland Jago Douma
Julius Haertl
John Molakvoæ