mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,058 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

12058 Commits

Author SHA1 Message Date
Georg Ehrke 6a99d6ed45 update 3rdparty submodule 2013-06-07 10:44:16 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Thomas Müller 705ab358d8 Merge pull request #3622 from owncloud/read-extfx-confg-from-home 
Read configuratons for external filesystem test from a private place.
 2013-06-06 16:19:48 -07:00
Robin Appelman 85abede9bf actually return result 2013-06-07 00:22:05 +02:00
Robin Appelman 0470a5ba94 fix variable name 2013-06-07 00:17:51 +02:00
Thomas Mueller 058c15a9f4 Read configuratons for external filesystem test from a private place. 
This will help not to accidentially push private data and enable testing on our ci server.
 2013-06-07 00:04:46 +02:00
Robin Appelman cf7321915d seperate mimetype guessing from filename 2013-06-06 23:51:44 +02:00
Björn Schießle d7a9852f7b use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened 2013-06-06 13:32:02 +02:00
Björn Schießle fdaab7372e always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not 2013-06-06 13:30:18 +02:00
Björn Schießle 97e05b71f8 add hint about what the recovery password field is for 2013-06-06 12:26:05 +02:00
Jenkins for ownCloud 81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +02:00
Morris Jobke 9d535d0034 trashbin -> deleted files 2013-06-05 21:50:38 +03:00
Björn Schießle 7fc5151d95 add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set 2013-06-05 18:53:02 +02:00
Björn Schießle 58fd76607b print a warning if a user wants to reset his password and encryption is enabled 2013-06-05 18:38:39 +02:00
Björn Schießle 036732c249 allow to press enter to update the password 2013-06-05 14:51:51 +02:00
Björn Schießle be324fad1c tell the user what he can do to regain access to his files 2013-06-05 14:19:26 +02:00
Björn Schießle 57bda411d1 only show personal settings if the recovery feature is enabled or if no private key is set 2013-06-05 13:51:28 +02:00
Jenkins for ownCloud 666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Michael Gapczynski cb9fe475c4 Merge branch 'master' into hook-improvements 
Conflicts:
	lib/files/view.php
 2013-06-04 18:19:08 -04:00
Thomas Müller c59ee99d93 Merge pull request #3594 from opensaucesystems/patch-1 
Added input[type="url"] to styles.css
 2013-06-04 14:01:09 -07:00
Thomas Mueller db1ca90319 exclude 3rdparty folder within files_external and files_encryption from code coverage 2013-06-04 22:41:52 +02:00
Florin Peter 055c901091 improved error msg and removed duplicate string 2013-06-04 22:31:36 +02:00
Björn Schießle 7bbd85b6e5 improved label for the password recovery feature 2013-06-04 21:19:42 +02:00
opensaucesystems d987bea635 Added input[type="url"] to styles.css 2013-06-04 16:04:29 +02:00
Björn Schießle 4ee7a428ae link directly to the encryption settings 2013-06-04 10:49:58 +02:00
Arthur Schiwon 4976f2e0d3 LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 2013-06-04 10:32:54 +02:00
Jenkins for ownCloud bc50d92841 [tx-robot] updated from transifex 2013-06-04 02:31:06 +02:00
Michael Gapczynski f608992099 Revise Contributing document 2013-06-03 19:43:43 -04:00
Florin Peter 14ac4fab05 better handling for http post 2013-06-04 00:41:47 +02:00
Thomas Tanghus 861fe54f2b Forgot the css. 2013-06-04 00:19:42 +02:00
Thomas Mueller d921004a6e ignore l10n folder within remaining apps 2013-06-04 00:04:17 +02:00
Florin Peter ef97481a0d changed redirect handling 2013-06-03 23:41:57 +02:00
Arthur Schiwon 61dadb05a6 Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location 2013-06-03 22:37:14 +02:00
Arthur Schiwon c8a2beccb0 Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374 2013-06-03 22:36:36 +02:00
Jörn Friedrich Dreyer 96b1e54d4a Merge pull request #3444 from owncloud/share-fix 
Fix undefined index for share mount point retrieval
 2013-06-03 11:35:06 -07:00
Jörn Friedrich Dreyer 1f8e92019e Merge pull request #3581 from owncloud/publicphp_maintenance 
public.php - check if maintenance mode is enabled
 2013-06-03 11:26:56 -07:00
Florin Peter b46e7323ec fixed typo 2013-06-03 19:10:55 +02:00
Florin Peter 563f343291 fix password change when files_encryption app is disabled 2013-06-03 19:06:20 +02:00
Florin Peter dc8bcf0688 reformat code 2013-06-03 18:42:13 +02:00
Björn Schießle 1e601cd6f1 use generated private key fro m setUp() 2013-06-03 17:43:06 +02:00
Björn Schießle 35c91ff901 added test for decryptPrivateKey() 2013-06-03 17:34:43 +02:00
icewind1991 8c991d97aa Merge pull request #3561 from owncloud/user 
Refactor of user management
 2013-06-03 08:13:40 -07:00
Thomas Tanghus 2572c9a6b7 Merge pull request #3578 from owncloud/ocdialog 
Replacement for jquery.dialog to fit better with ownCloud design.
 2013-06-03 06:37:27 -07:00
Björn Schießle b5820af3cc let user update private key password in case it was changed from outside, e.g. external auth back-ends 2013-06-03 15:27:31 +02:00
Björn Schießle b02f4dc62c $session->setPrivateKey expects only one parameter 2013-06-03 15:26:58 +02:00
Thomas Müller df5f02bed0 Exclude apps/files/l10n from coverage reports 2013-06-03 14:50:36 +02:00
Björn Schießle 42f66af5a3 control files are no longer needed, remove them from the tests 2013-06-03 14:21:30 +02:00
Björn Schießle 471d2b732c introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places 2013-06-03 14:19:31 +02:00
Robin Appelman 0ce2b2708c also clear cached users when removing a single backend 2013-06-03 14:19:17 +02:00
Robin Appelman 2a82964830 use caching for userExists 2013-06-03 13:46:05 +02:00