Commit Graph

6718 Commits

Author SHA1 Message Date
Morris Jobke c2686be8da Merge pull request #4285 from nextcloud/bump-md5
[js] Bump blueimp-md5
2017-04-11 12:07:02 -05:00
Roeland Jago Douma bd6273ee1c Merge pull request #4280 from nextcloud/share_via_display
Show 'shared via' in share list for reshares
2017-04-11 14:46:22 +02:00
Lukas Reschke afb5d45705 Merge pull request #4256 from nextcloud/theming
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Roeland Jago Douma 58f959864a
Show 'shared via' in share list for reshares
Fixes #1330

userA shares a file to userB
userB shares that file to userC

userA can see both userB and userC.
Now they can also see that userB shared it to user C

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 13:56:03 +02:00
Lukas Reschke 5ca5ebe584 Merge pull request #2618 from nextcloud/2fa-challenge-text
Move log out and backup codes link into 2fa box for better readability
2017-04-11 11:41:55 +02:00
Nextcloud bot 4d90b0520e
[tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Roeland Jago Douma 3810e89449
[js] Bump blueimp-md5 a major version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:56:56 +02:00
Roeland Jago Douma 7d1745d1e7
[js] Bump blueimp-md5
* bumped to latest
* moved to min

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:37:07 +02:00
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Nextcloud bot d25a96d921
[tx-robot] updated from transifex 2017-04-10 00:08:50 +00:00
Nextcloud bot 16091f4424
[tx-robot] updated from transifex 2017-04-09 00:07:40 +00:00
Nextcloud bot 4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares
Unified sharing options
2017-04-07 17:14:05 -05:00
Roeland Jago Douma bf30090be5
Parse date trough moment
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-07 22:16:29 +02:00
Jan-Christoph Borchardt 50609f0d7a Increase clickable area of app icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 21:01:22 +02:00
Jan-Christoph Borchardt 637920f669 Fix share dropdown opacity issue
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 20:44:54 +02:00
Jan-Christoph Borchardt 8db3419df1 Fix font-weight of Unshare entry
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 20:31:26 +02:00
Bjoern Schiessle 0dc13d098f
reset password field properties before we hide it
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle c7b1a48da7
add datepicker to the popover
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3bce6a7a6f
allow to edit single files shared by mail. This is useful for collaborative editing documents
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3323d01db1
update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Nextcloud bot 536650c02f
[tx-robot] updated from transifex 2017-04-07 00:09:11 +00:00
Nextcloud bot 7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Roeland Jago Douma 6bdd3a167d Merge pull request #4123 from nextcloud/allow-password-reset-with-email
Allow to reset the password with the email as an input
2017-04-05 09:12:41 +02:00
Roeland Jago Douma ddd157a84c Merge pull request #3741 from nextcloud/user-settings-design
User mgmt settings design improvements
2017-04-05 09:02:58 +02:00
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Jan-Christoph Borchardt 94d4d20c39
proper padding for checkboxes in app-settings
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-04 16:49:43 -05:00
Joas Schilling 75657c1a6e Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure
Make sure blob columns are correctly converted as parameters
2017-04-04 16:29:53 +02:00
Lukas Reschke e0227cb458 Merge pull request #2095 from nextcloud/bruteforcesetttings
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
Roeland Jago Douma efb21a948e Merge pull request #4093 from nextcloud/endorse-password-protection
Endorse password protection
2017-04-04 11:04:21 +02:00
Roeland Jago Douma aee2d6318f
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 10:29:12 +02:00
Nextcloud bot ec5377306d
[tx-robot] updated from transifex 2017-04-04 00:07:46 +00: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 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
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 5540def5e3
change permission order
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 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
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
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