Hendrik Leppelsack
bc5c89e9c0
remove javascript png fallback for svg
2016-07-01 16:36:37 +02:00
Vincent Petry
ba95297c5c
Merge pull request #25262 from owncloud/fed-sharing-error
...
Only save federated share after remote server is notified
2016-07-01 16:20:39 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
2d2d2267f7
[tx-robot] updated from transifex
2016-07-01 01:57:04 -04:00
Jenkins for ownCloud
1b9fa4dd5f
[tx-robot] updated from transifex
2016-06-30 01:55:56 -04:00
Jenkins for ownCloud
2b0f053126
[tx-robot] updated from transifex
2016-06-29 05:52:18 -04:00
Morris Jobke
b6397ef73a
Merge pull request #236 from nextcloud/master-sync-upstream
...
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Jenkins for ownCloud
894b7d93f6
[tx-robot] updated from transifex
2016-06-28 01:57:10 -04:00
Lukas Reschke
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
Christoph Wurst
b14376419d
Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsingleuser
...
Keep encryption enabled if decrypting for single user
2016-06-27 12:19:45 +02:00
Vincent Petry
199c8e304c
Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
...
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
Lukas Reschke
27b699bdbc
Migrate logic to dynamic controller
...
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
Vincent Petry
93f29f57c5
Merge pull request #25129 from owncloud/remove-ie
...
Remove ie8+9 support
2016-06-27 10:20:47 +02:00
Jenkins for ownCloud
ee90bef50a
[tx-robot] updated from transifex
2016-06-27 01:55:57 -04:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
52eab2a61a
[tx-robot] updated from transifex
2016-06-26 01:55:53 -04:00
Vincent Petry
f062b62f03
Keep encryption enabled if decrypting for single user
...
When decrypting all files of a single user, the admin usually does not
intend encryption to be suddenly disabled for everyone. This fix
reenables encryption after decrypting for a single user.
Decrypting for all users will still disable encryption globally.
2016-06-24 16:46:25 +02:00
Robin Appelman
ee674844f2
better detect errors in fed sharing response
2016-06-24 15:56:33 +02:00
Vincent Petry
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Vincent Petry
dc78d26f2a
Merge pull request #25239 from owncloud/setupchecks-preventreload
...
Don't reload page in case of auth errors during setup checks
2016-06-24 09:47:55 +02:00
Hendrik Leppelsack
e5d8726859
remove ie8+9 support
2016-06-23 12:34:53 +02:00
Vincent Petry
97f1813695
Don't reload page in case of auth errors during setup checks
...
If an error occurs during setup checks, do not let the global ajax
error handler reload the page.
2016-06-23 11:54:49 +02:00
Joachim Sokolowski
d7d7b49647
to Nextcloud
2016-06-22 17:41:01 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js
2016-06-22 16:58:06 +02:00
VicDeo
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
Morris Jobke
7e186194c4
Fix translation strings
2016-06-22 10:27:24 +02:00
Morris Jobke
7ba89b1175
Merge pull request #196 from JSoko/patch-2
...
singleuser.user.php -> nextcloud
2016-06-22 10:25:03 +02:00
Joachim Sokolowski
a83cbee717
changed to nextcloud
2016-06-22 08:20:23 +02:00
Joachim Sokolowski
1ffd8d0d96
nextcloud server
...
nextcloud server
2016-06-22 08:07:45 +02:00
Jenkins for ownCloud
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
Joachim Sokolowski
64a9f9d77b
singleuser.user.php -> nextcloud
...
Changed to nextcloud
2016-06-22 07:48:36 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
Jan-Christoph Borchardt
5df13ec5c4
make loading spinner thicker and color lighter
2016-06-20 11:00:42 +02:00
Jenkins for ownCloud
bd13353c4d
[tx-robot] updated from transifex
2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
cc532bb14a
[tx-robot] updated from transifex
2016-06-17 02:00:01 -04:00
Robin Appelman
8485f5bcb1
Prevent the advanced options toggle in the setup from acting as a link
2016-06-16 15:25:56 +02:00
Jan-Christoph Borchardt
44910510f6
fix grouped input fields, make sure they take precedence
2016-06-16 11:43:57 +02:00
Marius Blüm
d9be370b86
Merge pull request #83 from nextcloud/file-drop-highlight
...
File drop highlight
2016-06-15 17:36:16 +02:00
Morris Jobke
3720bae3ec
fix setup page strengthify
...
* fixes #105
2016-06-15 15:27:30 +02:00
Morris Jobke
a1b1d6ac7d
Update strengthify to 0.5.1
2016-06-15 15:20:21 +02:00
Vincent Chan
10f8d643dc
store icons in class
2016-06-15 14:42:39 +02:00
Jenkins for ownCloud
be4a29d75f
[tx-robot] updated from transifex
2016-06-15 05:54:49 +00:00
Morris Jobke
5e2726c0e7
Change name of the product in update message
...
* also update all german translations
* fixes #96
2016-06-14 17:02:55 +02:00
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
2016-06-14 01:06:25 +02:00
Jenkins for ownCloud
3840466f9a
[tx-robot] updated from transifex
2016-06-13 12:21:11 +00:00
Lukas Reschke
01f8434a75
Merge pull request #57 from nextcloud/fdrop-template
...
smaller files drop fixes
2016-06-13 00:14:34 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
Arthur Schiwon
ca43c49709
smaller files drop fixes
...
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
William Bargent
e90931c99b
Upload progress nextcloud blue
2016-06-11 08:47:29 +01:00
William Bargent
25470e6992
Sets notification background to white
2016-06-11 08:15:56 +01:00
Lukas Reschke
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
Jan-Christoph Borchardt
6a89518e98
invert colors of favicons to match header and log in site, white on blue
2016-06-10 18:03:29 +02:00
Jörn Friedrich Dreyer
c45b7b0bdf
Allow empty host when installing on oracle via CLI ( #25034 )
2016-06-10 11:16:32 +02:00
William Bargent
d64f46afae
Single block for PHP Mod not installed
2016-06-10 09:44:41 +01:00
Vincent Petry
6660488b73
Merge pull request #25048 from owncloud/email-login-leak
...
Do not leak the login name
2016-06-10 10:41:27 +02:00
Jenkins for ownCloud
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09
...
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
Lukas Reschke
0b00a06a0d
Fix indentation
2016-06-09 18:17:04 +02:00
Lukas Reschke
5fdde426eb
Add fancy layout
2016-06-09 17:55:26 +02:00
blizzz
51fd2602a7
Revert "Downstream 2016-06-08"
2016-06-09 17:41:57 +02:00
Thomas Müller
232d735893
Do not leak the login name - fixes #25047
2016-06-09 16:44:31 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
Joas Schilling
4c26abe228
Fix the FIXME ( #25022 )
2016-06-09 15:05:02 +02:00
Joas Schilling
7f88645eab
Allow to cancel 2FA after login
2016-06-09 14:00:02 +02:00
Sergio Bertolín
fad91e92f0
Fixed reviews
2016-06-09 14:00:00 +02:00
Joas Schilling
4f27c2c433
Allow to decrypt user '0' files only
2016-06-09 14:00:00 +02:00
Christoph Wurst
60e15e934c
do not generate device token if 2FA is enable for user
2016-06-09 14:00:00 +02:00
davitol
3b5c169869
Comments fixed
2016-06-09 13:59:59 +02:00
davitol
ad33992eb9
Fix Decrypt message via occ
2016-06-09 13:59:59 +02:00
Vincent Petry
90c1ec1c49
Merge pull request #25014 from owncloud/admin-datadircheck-fix
...
Use temporary htaccesstest.txt for data dir security check
2016-06-09 11:58:28 +02:00
Jenkins for ownCloud
355f50bd6c
[tx-robot] updated from transifex
2016-06-09 06:16:41 +00:00
Vincent Petry
7c8d2a8520
Merge pull request #25027 from owncloud/fix-22746-narrowtooltip
...
Added width of the tooltip
2016-06-08 17:34:30 +02:00
Jan-Christoph Borchardt
81145ee57c
THIS IS NEXTCLOUD! adjusting the design
2016-06-08 17:02:18 +02:00
Sergio Bertolín
e70bd36e5d
Added width of the tooltip
2016-06-08 11:38:39 +00:00
Vincent Petry
7dcc47dc94
Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa
...
Allow to cancel 2FA after login
2016-06-08 10:27:21 +02:00
Vincent Petry
12683b786d
Merge pull request #24991 from owncloud/2fa-do-not-generate-token
...
do not generate device token if 2FA is enable for user
2016-06-08 10:13:04 +02:00
Vincent Petry
9b6125e49b
Merge pull request #24992 from owncloud/fix_decrypt_message
...
Fix Decrypt message via occ
2016-06-08 10:12:47 +02:00
Vincent Petry
b7935dcebd
Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only
...
Allow to decrypt user '0' files only
2016-06-08 10:12:28 +02:00
Christoph Wurst
4bff16e52d
darker background image for better font contrast
2016-06-08 08:34:08 +02:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check
2016-06-07 18:36:13 +02:00
Joas Schilling
3e3b326c85
Allow to cancel 2FA after login
2016-06-07 18:17:29 +02:00
Sergio Bertolín
67c9e598ae
Fixed reviews
2016-06-07 07:55:28 +00:00
Joas Schilling
d4ba982131
Allow to decrypt user '0' files only
2016-06-07 09:13:11 +02:00
Christoph Wurst
8f7a4aaa4d
do not generate device token if 2FA is enable for user
2016-06-07 09:09:51 +02:00
William Bargent
6256bbdd20
Remove background from curved logo ( #24980 )
2016-06-06 17:06:28 +02:00
davitol
f9b3865093
Comments fixed
2016-06-06 16:10:49 +02:00
davitol
eaeb5d606d
Fix Decrypt message via occ
2016-06-06 15:28:49 +02:00
Jenkins for ownCloud
4234892a60
[tx-robot] updated from transifex
2016-06-04 02:01:18 -04:00
Jenkins for ownCloud
63132483ca
[tx-robot] updated from transifex
2016-06-03 02:19:30 -04:00
Vincent Petry
6b1422929d
Merge pull request #24947 from owncloud/2fa-remember-redirect-url
...
remember redirect_url when solving the 2FA challenge
2016-06-02 10:40:32 +02:00
Jenkins for ownCloud
f9f8fb7bf2
[tx-robot] updated from transifex
2016-06-02 01:55:16 -04:00
Christoph Wurst
5e71d23ded
remember redirect_url when solving the 2FA challenge
2016-06-01 14:43:47 +02:00
Jenkins for ownCloud
a9f666f36e
[tx-robot] updated from transifex
2016-06-01 01:56:03 -04:00
Vincent Petry
235f03da64
Merge pull request #24795 from owncloud/issue-24789-reset-password-link-new-window
...
Allow opening the password reset link in a new window when its a URL
2016-05-31 10:12:30 +02:00
Jenkins for ownCloud
b2e524b936
[tx-robot] updated from transifex
2016-05-31 01:54:58 -04:00
Vincent Petry
76c0bc29fe
Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue
...
Add visual cue when moving draggable item over droppable item,
2016-05-30 16:03:36 +02:00
Joas Schilling
0e3a0e0fdb
Allow setting debug as loglevel via occ log_manage ( #24834 )
2016-05-30 12:23:45 +02:00
Jenkins for ownCloud
c870e77546
[tx-robot] updated from transifex
2016-05-29 01:55:25 -04:00
Jenkins for ownCloud
c778fa062c
[tx-robot] updated from transifex
2016-05-28 01:55:21 -04:00
Jenkins for ownCloud
a95275d27b
[tx-robot] updated from transifex
2016-05-27 01:55:35 -04:00
Lukas Reschke
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
Jenkins for ownCloud
567381e361
[tx-robot] updated from transifex
2016-05-26 01:56:23 -04:00
Vincent Petry
25e6026fa6
Merge pull request #24735 from juliushaertl/passwordreset-invalid
...
Show error messages if a password reset link is invalid or expired
2016-05-25 11:08:46 +02:00
Jenkins for ownCloud
6972f4dc50
[tx-robot] updated from transifex
2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61
[tx-robot] updated from transifex
2016-05-24 15:24:38 -04:00
Christoph Wurst
ad10485cec
when generating browser/device token, save the login name for later password checks
2016-05-24 11:49:15 +02:00
Christoph Wurst
a0ccebfdcb
generate device token for UID, not login name
...
fixes #24785
2016-05-24 09:49:40 +02:00
Christoph Wurst
4128b853e5
login explicitly
2016-05-24 09:48:02 +02:00
Joas Schilling
5c063cf7c9
Allow opening the password reset link in a new window when its a URL
2016-05-24 09:23:25 +02:00
Vincent Petry
87fa86a69a
Merge pull request #24559 from owncloud/2fa
...
two factor auth
2016-05-23 20:50:03 +02:00
Julius Haertl
8ee2cb47d0
Show error messages if a password reset link is invalid or expired
...
- Moved token validation to method checkPasswordResetToken
- Render error with message from exceptions
2016-05-23 16:48:10 +02:00
Vincent Petry
4ba3668834
Merge pull request #24613 from owncloud/chunked-convert-database-queries
...
Chunk the "db:convert-type" select queries, to not run out of memory …
2016-05-23 14:28:44 +02:00
Christoph Wurst
847bbc51b6
add OCC command to enable/disable 2FA for a user
2016-05-23 11:21:13 +02:00
Christoph Wurst
dfb4d426c2
Add two factor auth to core
2016-05-23 11:21:10 +02:00
Jenkins for ownCloud
357d342467
[tx-robot] updated from transifex
2016-05-23 01:55:10 -04:00
Jenkins for ownCloud
88328000b1
[tx-robot] updated from transifex
2016-05-22 01:56:56 -04:00
Vincent Petry
6934840083
Merge pull request #24307 from owncloud/systemtags-perminterface
...
Add interface methods for permission check for system tags
2016-05-21 19:06:54 +02:00
Jenkins for ownCloud
bca7586574
[tx-robot] updated from transifex
2016-05-21 01:55:53 -04:00
Pellaeon Lin
56241afad7
Fix breadcrumb background right arrow due to incorrect background-image syntax
2016-05-21 12:54:29 +08:00
Pellaeon Lin
d3ff3c589b
Add visual cue when moving draggable item over droppable item,
...
ie. breadcrumb and filenameTd
2016-05-21 12:54:29 +08:00
Vincent Petry
66e93561da
Rename "not-assignble" to "restricted"
2016-05-20 17:56:02 +02:00
Vincent Petry
c7373798ba
Add app to shipped.json
2016-05-20 17:56:02 +02:00
Vincent Petry
88740f035d
Act on effective system tag canAssign permission
...
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.
This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
2016-05-20 17:56:02 +02:00
Jenkins for ownCloud
67162e636e
[tx-robot] updated from transifex
2016-05-20 01:54:52 -04:00
Vincent Petry
9f04248f62
Merge pull request #24657 from owncloud/fix-libreoffice-templates
...
Remove author from libreoffice templates
2016-05-18 18:11:49 +02:00
Jenkins for ownCloud
765782445a
[tx-robot] updated from transifex
2016-05-18 01:54:53 -04:00
Thomas Müller
60bafcda73
Fix #24655
2016-05-17 20:43:02 +02:00
Jenkins for ownCloud
c24a685ab5
[tx-robot] updated from transifex
2016-05-17 01:54:56 -04:00
Jenkins for ownCloud
7c28f62e20
[tx-robot] updated from transifex
2016-05-15 01:55:34 -04:00
Joas Schilling
df4d6063d0
Chunk the "db:convert-type" select queries, to not run out of memory so fast
2016-05-13 10:04:10 +02:00
Jenkins for ownCloud
cba4875e4d
[tx-robot] updated from transifex
2016-05-13 02:08:45 -04:00
Christoph Wurst
e077d78ec9
Show login error message correctly ( #24599 )
2016-05-12 16:53:50 +02:00
Lukas Reschke
52add798d4
Do not automatically try to enable index.php-less URLs ( #24539 )
...
The current logic for mod_rewrite relies on the fact that people have properly configured ownCloud, basically it reads from the `overwrite.cli.ur
l` entry and then derives the `RewriteBase` from it.
This usually works. However, since the ownCloud packages seem to install themselves at `/owncloud` (because subfolders are cool or so…) _a lot_ of people have just created a new Virtual Host for it or have simply symlinked the path etc.
This means that `overwrite.cli.url` is wrong, which fails hard if it is used as RewriteBase since Apache does not know where it should serve files from. In the end the ownCloud instance will not be accessible anymore and users will be frustrated. Also some shared hosters like 1&1 (because using shared hosters is so awesome… ;-)) have somewhat dubious Apache configurations or use versions of mod_rewrite from the mediveal age. (because updating is money or so…)
Anyhow. This makes this explicitly an opt-in configuration flag. If `htaccess.RewriteBase` is set then it will configure index.php-less URLs, if
admins set that after installation and don't want to wait until the next ownCloud version they can run `occ maintenance:update:htaccess`.
For ownCloud 9.0 we also have to add a repair step to make sure that instances that already have a RewriteBase configured continue to use it by copying it into the config file. That way all existing URLs stay valid. That one is not in this PR since this is unneccessary in master.
Effectively this reduces another risk of breakage when updating from ownCloud 8 to ownCloud 9.
Fixes https://github.com/owncloud/core/issues/24525 , https://github.com/owncloud/core/issues/24426 and probably some more.
2016-05-12 09:43:26 +02:00
Jenkins for ownCloud
c5ae14453a
[tx-robot] updated from transifex
2016-05-12 02:08:58 -04:00
Lukas Reschke
ee0ebd192a
Use proper URL generation function ( #24576 )
...
Fixes the redirection after login, otherwise `core/files/index` is opened which fails.
2016-05-11 19:39:57 +02:00
Christoph Wurst
0486d750aa
use the UID for creating the session token, not the login name
2016-05-11 13:36:46 +02:00
Christoph Wurst
214aa6639c
fix login with email
2016-05-11 13:36:46 +02:00
Christoph Wurst
46bdf6ea2b
fix PHPDoc and other minor issues
2016-05-11 13:36:46 +02:00
Christoph Wurst
3ffa7d986a
show login error
2016-05-11 13:36:46 +02:00
Christoph Wurst
f0f8bdd495
PHPDoc and other minor fixes
2016-05-11 13:36:46 +02:00
Christoph Wurst
fbb5768587
add unit tests for all new classes
2016-05-11 13:36:46 +02:00
Christoph Wurst
aa85edd224
increase token column width
...
add some range to time() assertions
2016-05-11 13:36:46 +02:00
Christoph Wurst
aafd660b97
fix LoginController unit tests
2016-05-11 13:36:46 +02:00
Christoph Wurst
7aa16e1559
fix setup
2016-05-11 13:36:46 +02:00
Christoph Wurst
fdc2cd7554
Add token auth for OCS APIs
2016-05-11 13:36:46 +02:00
Christoph Wurst
8d48502187
Add index on 'last_activity'
...
add token type column and delete only temporary tokens in the background job
debounce token updates; fix wrong class import
2016-05-11 13:36:46 +02:00
Christoph Wurst
53636c73d6
Add controller to generate client tokens
2016-05-11 13:36:46 +02:00
Christoph Wurst
3ab922601a
Check if session token is valid and log user out if the check fails
...
* Update last_activity timestamp of the session token
* Check user backend credentials once in 5 minutes
2016-05-11 13:36:46 +02:00
Christoph Wurst
d8cde414bd
token based auth
...
* Add InvalidTokenException
* add DefaultTokenMapper and use it to check if a auth token exists
* create new token for the browser session if none exists
hash stored token; save user agent
* encrypt login password when creating the token
2016-05-11 13:36:46 +02:00
Thomas Müller
199b447527
Yo-ho-oh - Murder all band 'o pirates
2016-05-11 09:16:17 +02:00