Commit Graph

5538 Commits

Author SHA1 Message Date
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