Morris Jobke
51bcb0bbe1
Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars
...
allow sharees to edit certain calendar properties for themselves
2017-04-03 13:12:56 -05:00
Roeland Jago Douma
55c94caff5
Merge pull request #4191 from nextcloud/bump-autosize
...
Bump autosize
2017-04-03 15:32:42 +02:00
Christoph Wurst
a7cc8c86ab
Redirect to 2FA selection screen
...
Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.
Fixes https://github.com/nextcloud/server/issues/3702
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-03 14:31:57 +02:00
Roeland Jago Douma
7d72ae3011
Move to autosize.min.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:42:33 +02:00
Roeland Jago Douma
497fe1682f
Bump autosize.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:40:34 +02:00
Roeland Jago Douma
455542d306
Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars
...
Make sure transparency is an integer when saving a calendar
2017-04-03 12:46:00 +02:00
Jos Poortvliet
13e7a93860
Merge pull request #4189 from nextcloud/add-issue-template-app
...
Add reference to issue template app
2017-04-03 12:12:00 +02:00
Jos Poortvliet
543555ec95
Update issue_template.md
2017-04-03 12:11:34 +02:00
Christoph Wurst
cbe44043be
Merge pull request #4131 from nextcloud/fix-jscombiner
...
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
Roeland Jago Douma
47e342c730
Merge pull request #4175 from nextcloud/fix-socialmenudisplay
...
Do not show social menu when there is no link share
2017-04-03 10:59:44 +02:00
Bjoern Schiessle
5e7197e49f
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:25 +02:00
Timo Benk
868500eda4
let the user set an empty password for share link
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:19 +02:00
Timo Benk
0d7801b6ce
endorseLinkPassword changed to enableLinkPasswordByDefault
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:11 +02:00
Timo Benk
cbfe5f3c1f
feature endorse password for share links
...
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:03 +02:00
Bjoern Schiessle
b85b6f2439
feature endorse password for share links
...
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:57:52 +02:00
Bjoern Schiessle
5540def5e3
change permission order
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
dac6826ad7
setting to disable sending password by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
99ebdc1111
make sure that variables are defined correctly
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle
cfbabf8f2f
fix typo and capitalize cruds
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
b84fd7c361
set expire date for all share types
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
3cc0d15f92
add secure drop functionallity to mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c191173d59
allow password protected mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle
c6613ee8fc
fix share provider id
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Bjoern Schiessle
0d5147bd49
add new password column to the share table in order to set passwords for share by mails
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Bjoern Schiessle
d0eefd17d3
allow the user to set a expire date for all shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:47 +02:00
Nextcloud bot
d56f6399eb
[tx-robot] updated from transifex
2017-04-03 00:08:20 +00:00
Lukas Reschke
7909d4e46c
Add reference to issue template app
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-02 22:13:04 +02:00
Roeland Jago Douma
e09c386f70
Move app to own repo
...
https://github.com/nextcloud/bruteforcesettings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:26:02 +02:00
Morris Jobke
ed00bab80b
Fixed layout of bruteforcesettings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-02 21:19:30 +02:00
Roeland Jago Douma
86022f8710
Fix app
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:16:22 +02:00
Roeland Jago Douma
4e0479f3a8
Update App Manager test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:51 +02:00
Roeland Jago Douma
c637ff556a
App is always enabled
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
Roeland Jago Douma
be674c19a5
Respect bruteforce settings in the Throttler
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
Roeland Jago Douma
dca555b7f3
Adds security section to the admin page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:09 +02:00
Roeland Jago Douma
6a40dce138
Initial commit of the bruteforcesettings app
...
This adds the bruteforce settings app that allows to configure (for now)
subnets that are to be ignored when doing brute force analysis. This can
for example be the LAN since we trust people from there.
* Add app
* Add php tests
* Add js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:08:53 +02:00
Lukas Reschke
f31dafe4a8
Merge pull request #4183 from nextcloud/css-shortcuts-view
...
Add CSS for styling of keyboard shortcuts view
2017-04-02 16:45:07 +02:00
Nextcloud bot
0056211672
[tx-robot] updated from transifex
2017-04-02 00:07:48 +00:00
Roeland Jago Douma
2fa84ecfe0
Merge pull request #4139 from nextcloud/phpseclib
...
[3rdparty] Bump phpseclib to 2.0.4
2017-04-01 14:00:25 +02:00
Christoph Wurst
468f502c8d
Merge pull request #4174 from nextcloud/mergejs-newline
...
mergejs should print a newline between imports
2017-04-01 08:38:47 +02:00
Nextcloud bot
9098042c95
[tx-robot] updated from transifex
2017-04-01 00:08:09 +00:00
Roeland Jago Douma
2950bcbc70
Do not show social menu when there is no link share
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:29:41 +02:00
Roeland Jago Douma
04fc00fcdf
mergejs should print a newline between imports
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:06:38 +02:00
Roeland Jago Douma
57020a0c36
Merge pull request #3438 from nextcloud/external-storage-user-folder
...
Allow using '/' as external storage mountpoint
2017-03-31 15:07:39 +02:00
Björn Schießle
85da9378c0
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
...
Don't add the Encryption Storage Wrapper if there are no encryption modules
2017-03-31 14:49:38 +02:00
Nextcloud bot
6a6300b1f2
[tx-robot] updated from transifex
2017-03-31 00:08:35 +00:00
Joas Schilling
738730f7b2
Also add the root of external storages to the file id list
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 23:26:19 +02:00
Roeland Jago Douma
548871a9f3
Merge pull request #3832 from nextcloud/fix_1303
...
Do not clear CSRF token on logout (fix for #1303 )
2017-03-30 18:25:50 +02:00
Joas Schilling
43143e170e
Make sure transparency is an integer when saving a calendar
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 17:58:33 +02:00
Robin Appelman
7d4c4224d1
fix setup of external storage integration tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 17:16:59 +02:00
Joas Schilling
a51e4dd259
Merge pull request #4150 from nextcloud/capped-memcache-push
...
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00