wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33086 commits 157 branches 562 tags 714 MiB
Commit graph

5514 commits

Author SHA1 Message Date
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
Jenkins for ownCloud
7da5331782 [tx-robot] updated from transifex 2016-05-11 01:55:55 -04:00
Morris Jobke
0543f8a839 Merge pull request #24397 from owncloud/sort-share-links 
Reordered share link settings
 2016-05-10 18:42:10 +02:00
Lukas Reschke
e8e72aa910 Merge pull request #24434 from owncloud/permalinks 
Permalinks
 2016-05-10 09:44:50 +02:00
Thomas Müller
885c842100 Merge pull request #24491 from owncloud/new-animated-full-css-spinner 
New animated loader: full css
 2016-05-09 11:32:32 +02:00
Jenkins for ownCloud
10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
skjnldsv
ea3cc2661d New animated loader 2016-05-09 07:54:43 +02:00
Jenkins for ownCloud
956c3f2719 [tx-robot] updated from transifex 2016-05-07 01:54:56 -04:00
Vincent Petry
254576e1f7
Do not encode slashes in "dir" URL param in files JS 2016-05-06 17:00:22 +02:00
Vincent Petry
fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Vincent Petry
093e9dd422
Add route to resolve fileid to files app URL 
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
 2016-05-06 16:46:59 +02:00
Jenkins for ownCloud
6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
Jenkins for ownCloud
cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Thomas Müller
4b2544925f Merge pull request #23844 from owncloud/disable-user 
Add occ commands to enable and disable a user + a disabled user can n…
 2016-05-03 15:22:41 +02:00
Lukas Reschke
df2eb96cc4 Merge pull request #24389 from owncloud/login-by-email 
Allow login by email address
 2016-05-03 13:44:38 +02:00
Roeland Jago Douma
fc82047e26
Move OC_Log_xx to \OC\Log namespace 2016-05-03 08:57:26 +02:00
Jenkins for ownCloud
1974ae8da7 [tx-robot] updated from transifex 2016-05-03 01:57:34 -04:00
Vincent Chan
e07901b63b Reordered share link settings 
closes #24122
 2016-05-02 20:33:45 +02:00
Thomas Müller
7aca13f14c
Allow login by email address 2016-05-02 14:51:01 +02:00
Thomas Müller
9c9fec36dd
Add occ commands to enable and disable a user + a disabled user can no longer login - fixes #23838 2016-05-02 09:31:22 +02:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Thomas Müller
7ad1d491f4
Adding progress to occ upgrade 2016-04-28 13:52:01 +02:00
Thomas Müller
821d8736c8
Adding progress to web upgrade 2016-04-28 13:52:01 +02:00
Thomas Müller
cdcd49b473
Adding progress to occ maintenance:repair 2016-04-28 13:52:01 +02:00
Jenkins for ownCloud
ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Thomas Müller
20602ff36a Merge pull request #21417 from J0WI/css-fixes 
css fallbacks and code style fixes
 2016-04-27 09:47:36 +02:00
Jenkins for ownCloud
2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Jenkins for ownCloud
dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Thomas Müller
48b61b7b5a
Deprecate appinfo/update.php - RepairSteps within info.xml are to be used 2016-04-22 17:22:40 +02:00
Björn Schießle
606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares 
bring back CRUDS permissions for federated shares
 2016-04-22 14:50:42 +02:00
Thomas Müller
cc4efc4c03 Merge pull request #24085 from owncloud/feedback-on-app-migrations 
App migration steps need to push feedback to the user ....
 2016-04-22 14:39:11 +02:00
Lukas Reschke
2c4ef37025 Merge pull request #24126 from owncloud/err-reload-delay 
Delay reloading the page if an ajax error occurs, show notification
 2016-04-22 11:23:39 +02:00
Thomas Müller
3aa77960ef
Adding pre- and post-migration repair steps 2016-04-22 09:26:31 +02:00
Thomas Müller
d0030aad6c
Remove deprecated HTTPHelper from InfoParser 2016-04-22 08:38:41 +02:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Thomas Müller
e673ff0f33 Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfix 
Revert "add word wrap to tooltips. Fixes #22746"
 2016-04-21 12:52:50 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Lukas Reschke
e977a24ba1 Revert "add word wrap to tooltips. Fixes #22746" 2016-04-20 23:13:07 +02:00
Robin McCorkell
62024d74d4 Add test for reload delay 2016-04-20 22:09:59 +01:00
Thomas Müller
7e2a1656f9 Merge pull request #24132 from owncloud/fix-web-updater 
Fix web updater
 2016-04-20 21:50:00 +02:00
Morris Jobke
6b66f2dfb4 Merge pull request #23990 from owncloud/heartbeat-debounce 
Debounce heartbeat ajax calls to lower the number of requests
 2016-04-20 21:23:10 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
22db0f17a8 Fix web updater - fixes #24115 2016-04-20 20:32:47 +02:00
Björn Schießle
2a6a336e87
always share with same default permissions, no special handling for remote shares 2016-04-20 17:47:33 +02:00
Robin McCorkell
bd9a380d53 Delay reloading the page if an ajax error occurs, show notification 2016-04-20 16:31:04 +01:00
Jan-Christoph Borchardt
5fe630c4f1 Merge pull request #23980 from owncloud/remember-email-when-setting-expirationdate 
remember email when setting expiration date
 2016-04-20 11:42:02 +02:00
Jenkins for ownCloud
a296cbd203 [tx-robot] updated from transifex 2016-04-20 01:54:55 -04:00
Christoph Wurst
e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') 2016-04-19 16:20:17 +02:00
Thomas Müller
b441d3dcb3 Merge pull request #24062 from owncloud/fix-gitignore 
Fix gitignore for core/vendor
 2016-04-19 16:06:59 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Roeland Douma
0c5f915377 Merge pull request #24054 from owncloud/data_fingerprint 
Add data-fingerprint property
 2016-04-19 14:24:27 +02:00
Christoph Wurst
59e268763c
remove deprecated jQuery.browser 2016-04-19 11:55:40 +02:00
Christoph Wurst
e7f07ba02e
extract mail view for sending share invitations 
fixes #22947
 2016-04-19 11:37:23 +02:00
Thomas Müller
7186975e35 Merge pull request #23993 from owncloud/update-to-jquery2 
Update jquery to version 2.2.3
 2016-04-19 10:26:08 +02:00
Jenkins for ownCloud
f812f51c5d [tx-robot] updated from transifex 2016-04-19 01:55:59 -04:00
Thomas Müller
00ad23f3c1 Merge pull request #24049 from owncloud/skjnldsv-fix-colors-values 
Fix rgb values
 2016-04-19 06:59:14 +02:00
Lukas Reschke
8222ad5157
Move logout to controller 
Testable code. Yay.
 2016-04-18 21:21:52 +02:00
Christoph Wurst
b4c5a5b9bf Merge pull request #23911 from owncloud/split-upgrade-command 
Move version check code out of class Updater
 2016-04-18 20:58:00 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater 2016-04-18 17:12:59 +02:00
Thomas Müller
739dfb5c66
Suggest cli based updater in case the instance is bigger - #23913 2016-04-18 17:09:21 +02:00
Roeland Jago Douma
a2c8597b00
Add occ command for updating the data-fingerprint 2016-04-18 16:08:19 +02:00
Christoph Wurst
2d772eaaa8
Debounce heartbeat ajax calls to lower the number of requests 
fixes #22397
 2016-04-18 14:19:26 +02:00
Morris Jobke
b2a3a5cf69
remove unneeded files 2016-04-18 13:56:39 +02:00
Morris Jobke
f4930cd567
Fix gitignore for core/vendor 
* es6-promise and davclient.js
 2016-04-18 13:56:10 +02:00
Bjoern Schiessle
4ab02c0c76
bring back CRUDS permissions for federated shares 2016-04-18 12:02:03 +02:00
Lukas Reschke
14fdafaede Merge pull request #23947 from owncloud/login-to-ctrl 
Move login form into controller
 2016-04-18 11:47:57 +02:00
Christoph Wurst
5900e46f01
Turn off jQuery animations when testing 2016-04-18 10:41:02 +02:00
John Molakvoæ
e11b39a248 Fix rgb values 
Fix was required because values was too big for rgb and breaking the brightness calculation.
Now we have the initial sat (70%) and the reduction to 60 if too bright working again.
 2016-04-18 09:29:42 +02:00
Jenkins for ownCloud
d33f048bee [tx-robot] updated from transifex 2016-04-17 01:54:52 -04:00
Jenkins for ownCloud
90a77cb868 [tx-robot] updated from transifex 2016-04-16 01:55:11 -04:00
Lukas Reschke
d4a93893bb
Also check for an empty string 
PHP. Yay.
 2016-04-15 19:53:14 +02:00
Lukas Reschke
fee95084ae
Rename username to loginName 
UID and login name are two different things.
 2016-04-15 19:02:19 +02:00
Lukas Reschke
8a650a51be
Use !== instead of empty 
Users can be named null
 2016-04-15 18:57:11 +02:00
Lukas Reschke
331e4efacb
Move login form into controller 
First step on getting the authorisation stuff cleaned up. This is only for the login form, all other stuff is still where it is.
 2016-04-15 17:36:23 +02:00
Christoph Wurst
3e1f1ccc76 downgrade jquery, update jquery-migrate 2016-04-15 13:55:23 +02:00
Jenkins for ownCloud
e6b0874087 [tx-robot] updated from transifex 2016-04-15 01:54:55 -04:00
Thomas Müller
a4938d9b26 Merge pull request #23994 from owncloud/log-in-image 
use background image for log in view
 2016-04-14 23:12:43 +02:00
Christoph Wurst
08dd81e0ba add jquery files to git 2016-04-14 13:11:05 +02:00
Christoph Wurst
621d1e2128 update jquery to version 2.2.3 2016-04-14 12:47:35 +02:00
Jan-Christoph Borchardt
2ab077d16e use background image for log in view 2016-04-14 12:36:55 +02:00
Thomas Müller
6d9e15c6a1 Merge pull request #22760 from owncloud/tooltip-cssfix 
add word wrap to tooltips. Fixes #22746
 2016-04-14 11:53:35 +02:00
Christoph Wurst
97d553b57a close navigation menu when opening app in new tab (#23914) 2016-04-14 11:53:20 +02:00
Christoph Wurst
a2572ffec7 add loading feedback to user menu entries (#23916) 
fixes #19857
 2016-04-14 11:53:09 +02:00
Jenkins for ownCloud
54f6c05c79 [tx-robot] updated from transifex 2016-04-14 01:55:58 -04:00
Morris Jobke
e03d289b70
Use 6 months as SSL STS header threshold 
* this uses 6 months (6 * 30 * 24 * 60 * 60 = 15552000)
* old value was half a year (365 / 2 * 24 * 60 * 60 = 15768000)
* fixes #23957
 2016-04-13 08:47:34 +02:00
Jenkins for ownCloud
a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Thomas Müller
fdee771aca Add unit testing capabilities for templates (#23708) 
Add unit testing capabilities for templates
 2016-04-12 12:49:11 +02:00
Hendrik Leppelsack
c7482eee4e Checkboxes (#23063) 
* remove ie8 fixes for checkboxes

* add indeterminate style to checkboxes

* add styles for radio inputs

* add missing checkbox-mixed-disabled icon

* fix white radios

* remove unnecessary png file
 2016-04-12 09:47:14 +02:00
Jenkins for ownCloud
59080bef51 [tx-robot] updated from transifex 2016-04-12 02:08:35 -04:00
Jenkins for ownCloud
c6f65a3c79 [tx-robot] updated from transifex 2016-04-11 01:54:50 -04:00
skjnldsv
408bdd65c2 Added white download icons 2016-04-10 13:54:17 +02:00
Jenkins for ownCloud
a29e732607 [tx-robot] updated from transifex 2016-04-10 01:54:49 -04:00
Jenkins for ownCloud
e68c4b1d73 [tx-robot] updated from transifex 2016-04-09 12:28:39 -04:00
Jenkins for ownCloud
1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
John Molakvoæ
28571e6361 Updated color generator 
Separated the main function to allow special use without dom manipulation.
 2016-04-06 19:34:50 +02:00
Roeland Douma
93b1768eb7 Merge pull request #23819 from owncloud/move-core-completely-to-psr4 
Move OC/Core completely to PSR-4
 2016-04-06 13:31:44 +02:00
Jenkins for ownCloud
de122a9b04 [tx-robot] updated from transifex 2016-04-06 06:47:12 -04:00
Lukas Reschke
a4b19a5b1e
Rename files to be PSR-4 compliant 2016-04-06 11:00:52 +02:00