Commit graph

5469 commits

Author SHA1 Message Date
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +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