Commit Graph

6796 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 535ec04245
expand clickable area of popover menu entries to full width
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-18 16:59:35 -05:00
Joas Schilling 1c0bffe87f
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Nextcloud bot c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Bjoern Schiessle c6ae57ecee
simplify share placeholder
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-18 12:08:35 +02:00
Nextcloud bot b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Lukas Reschke 727688ebd9
Adjust existing bruteforce protection code
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
Roeland Jago Douma 6b79bf0960 Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
Make BruteForceProtection annotation more clever
2017-04-14 08:15:55 +02:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Lukas Reschke 8149945a91
Make BruteForceProtection annotation more clever
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.

Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 23:05:33 +02:00
Lukas Reschke 81d3732bf5 Merge pull request #4308 from nextcloud/lost-password-email
Update email template for lost password email
2017-04-13 20:02:15 +02:00
Morris Jobke d36751ee38 Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
Fix login controller test and consolidate login
2017-04-13 12:16:38 -05:00
Morris Jobke ec034757fa Merge pull request #4337 from nextcloud/fix-adblock-share-icon
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
Lukas Reschke 66835476b5
Add support for ratelimiting via annotations
This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Morris Jobke 7cb6038fca Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
Dont create a log entry on email login
2017-04-13 01:04:11 -05:00
Nextcloud bot 396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Roeland Jago Douma 3eb6f88019
Move to handlebars.min.js
core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-12 22:22:38 +02:00
Morris Jobke 1f962f9115
Update email template for lost password email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 15:19:53 -05:00
Roeland Jago Douma abe887cd48
Moved to jquery-ui.custom.min.js
Shaves off about 200kb of the default loaded js libs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-12 20:03:00 +02:00
Bjoern Schiessle a3c9dcf82a
change sharing tooltip with a more general description of all available share options
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 16:07:42 +02:00
Jan-Christoph Borchardt 37145a275f Fix AdBlock blocking share icon, ref #866
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-12 15:04:12 +02:00
Lukas Reschke b5d31e4e65 Merge pull request #4309 from nextcloud/remove-unused-code
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
Nextcloud bot 633b952358
[tx-robot] updated from transifex 2017-04-12 00:07:44 +00:00
Morris Jobke 8fa5141aaa
Removes unused code for link share emails
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:32:48 -05:00
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
Joas Schilling 7ad791efb4
Dont create a log entry on email login
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 10:15:20 +02:00
Nextcloud bot 536650c02f
[tx-robot] updated from transifex 2017-04-07 00:09:11 +00:00
Arthur Schiwon 7b3fdfeeaa
do login routine only once when done via LoginController
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:42 +02:00
Arthur Schiwon 2994cbc586
fix login controller tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:20:17 +02: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
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
Nextcloud bot 6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Joas Schilling 0fb7c631ce Merge pull request #4128 from nextcloud/updateclipboard
Update clipboard.js
2017-03-30 14:37:03 +02:00
Jan-Christoph Borchardt 7788afaccf Add CSS for styling of keyboard shortcuts view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-30 13:07:26 +02:00
Lukas Reschke 1ee7e1c0b1 Merge pull request #4132 from nextcloud/fix-safari-gzip
Fix gzip files for Safari
2017-03-30 10:47:28 +02:00
Morris Jobke 85fcd42065 Merge pull request #4100 from nextcloud/header-indicator
show triangle below user menu too when an entry inside there is active
2017-03-29 21:43:18 -06:00
Nextcloud bot f984cf0987
[tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Morris Jobke e8f2ee769b Merge pull request #4142 from nextcloud/numeric_avatar
Allow avatars for full numeric users
2017-03-29 17:17:19 -06:00
Roeland Jago Douma 0da04fd284
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 22:54:08 +02:00
Jan-Christoph Borchardt 9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Roeland Jago Douma 54c68519ce
Allow avatars for full numeric users
Fixes #4087

Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 13:39:48 +02:00
Joas Schilling a88edce54f Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p
Replace unecessary unescaped prints with print
2017-03-29 10:02:10 +02:00
Morris Jobke 9813023aab
Fix gzip files for Safari
* Safari support gzip only if the filename does not
  end on .gz - so this renames them to .gzip

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:11:51 -06:00
Morris Jobke 05f2596311 Merge pull request #4091 from nextcloud/Rudloff-manifest
Web app manifest for adding to Android home screen
2017-03-28 21:36:54 -06:00
Pierre Rudloff 19d3133ccf
Web app manifest
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 18:39:57 -06:00
Nextcloud bot 58513255d2
[tx-robot] updated from transifex 2017-03-29 00:07:41 +00:00
Morris Jobke 9e1fdf4da5 Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar
Better styling of the empty content messages in the sidebar
2017-03-28 17:50:10 -06:00
Morris Jobke 16b8c0c691 Merge pull request #4070 from nextcloud/gzip_scss_js
GZip generated CSS/JS files
2017-03-28 17:11:17 -06:00
Lukas Reschke 99675b46e9
Replace unecessary unescaped prints with print
There's no need to have those unescaped from what I can see.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:43:44 +02:00