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

5994 Commits

Author SHA1 Message Date
Roeland Jago Douma 02525fd98b
Move preview endpoint to controller 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma 743132650a
Move to AppData 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:32 +01:00
Roeland Jago Douma 958c1289b1
New preview generator 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:32 +01:00
Christoph Wurst e11197bc48 Merge pull request #1954 from nextcloud/issue_#1953 
#1953 add can to subshare options
 2016-11-03 11:50:29 +01:00
Andreas Hechenberger 09c4fe6d62
Fixes https://github.com/nextcloud/server/issues/1953 
Signed-off-by: Andreas Hechenberger <world@greenstation.de>
 2016-11-03 11:19:45 +01:00
Nextcloud bot 8471219b7c
[tx-robot] updated from transifex 2016-11-03 01:07:06 +00:00
Morris Jobke 39573e602d Merge pull request #1978 from nextcloud/remove-send-mail-option 
Remove send mail option
 2016-11-02 22:36:05 +01:00
Roeland Jago Douma 7d17b42f4d
Remove from core.json 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-02 21:17:05 +01:00
Bjoern Schiessle d235c4833f
remove the 'shareapi_allow_mail_notification' setting 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 21:17:05 +01:00
Morris Jobke e6b52ef4cd Merge pull request #1347 from nextcloud/bring-back-remember-me 
fix remember me login
 2016-11-02 18:32:38 +01:00
Bjoern Schiessle f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 18:30:38 +01:00
Michael Grosser e81d04cd8d Merge pull request #1940 from nextcloud/new-appstore 
Use new appstore API
 2016-11-02 17:00:24 +00:00
Christoph Wurst d907666232
bring back remember-me 
* try to reuse the old session token for remember me login
* decrypt/encrypt token password and set the session id accordingly
* create remember-me cookies only if checkbox is checked and 2fa solved
* adjust db token cleanup to store remembered tokens longer
* adjust unit tests

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-11-02 13:39:16 +01:00
Joas Schilling 7da3ba3f91 Merge pull request #657 from nextcloud/share-by-mail 
New share provider: Share by mail
 2016-11-02 11:04:33 +01:00
Roeland Jago Douma 42b0a0d2af Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin 
Color the trusted domain to alert the admin a bit more
 2016-11-02 10:06:35 +01:00
Roeland Jago Douma 19af06cdea Merge pull request #1951 from nextcloud/settingsmaxheight 
restricted the height of the settings area in core/css/apps.css
 2016-11-02 08:45:05 +01:00
Nextcloud bot 122fbf0092
[tx-robot] updated from transifex 2016-11-02 01:07:09 +00:00
Bjoern Schiessle 86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle ce08682c2f
enabled by default and add to shipped.json 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle 561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:41 +01:00
Bjoern Schiessle 392c8a115f
unified way to display remote shares and mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle 77f74b9780
handle case if no share-by-mail share provider is loaded 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:54:40 +01:00
Bjoern Schiessle a17c6a485d
add share by mail share provider 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Bjoern Schiessle 0a6f02801f
introduce share by mail, ui part 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-01 19:51:11 +01:00
Nextcloud bot 20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Lukas Reschke 8d83e239f3
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-10-31 17:17:45 +01:00
Joas Schilling 247b7f37ce
Color the trusted domain to alert the admin a bit more 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-31 12:22:21 +01:00
Roeland Jago Douma 7f30cf9119
Remove config.php for oc.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 11:00:39 +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
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
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
Nextcloud bot ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00: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 57e61250ac
Remove notify recipient option 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-26 20:52:36 +02:00
Nextcloud bot a973c1bfb9
[tx-robot] updated from transifex 2016-10-26 00:07:12 +00: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 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 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 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
Morris Jobke 89574367bc Merge pull request #1871 from nextcloud/use-csp-nonces 
Use CSP nonces
 2016-10-25 14:46:00 +02:00
Nextcloud bot e23a298a81
[tx-robot] updated from transifex 2016-10-25 09:36:09 +00:00
Joas Schilling 890f752a6b Merge pull request #1452 from nextcloud/appconfig-endpoint 
Appconfig endpoint
 2016-10-25 10:57:48 +02:00