Commit graph

11878 commits

Author SHA1 Message Date
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 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
Robin Appelman
83fbdc903f cast result to bool 2013-06-03 13:39:34 +02:00
Robin Appelman
eb2a1e0f8a move phpdoc comments 2013-06-03 13:33:56 +02:00
Robin Appelman
1a4021a0fe User: return backend result 2013-06-03 13:19:01 +02:00
Robin Appelman
fbe3213fec User: consisten variable naming 2013-06-03 13:17:03 +02:00
Robin Appelman
00b4bfcbf5 User: remove determineDisplayName 2013-06-03 13:15:42 +02:00
Georg Ehrke
ce14788ac0 public.php - check if maintenance mode is enabled 2013-06-03 12:57:47 +02:00
Jörn Friedrich Dreyer
b76725c1fa Merge pull request #3560 from owncloud/init-order-session
initialize the session earlier
2013-06-03 03:21:05 -07:00
Thomas Tanghus
46d4886709 Set default button in oc-dialogs 2013-06-03 03:31:33 +02:00
Thomas Tanghus
5f1cbc6a1a Catch double destroy on escape. 2013-06-03 03:19:35 +02:00
Jenkins for ownCloud
422c6f7252 [tx-robot] updated from transifex 2013-06-03 02:34:10 +02:00
Thomas Tanghus
afd723fdcd Let the content determine overflow. 2013-06-03 02:11:01 +02:00
Thomas Mueller
c4ba4b771c fixing code coverage 2013-06-03 01:01:28 +02:00
Thomas Mueller
17d83cc17f Fixing code coverage analysis 2013-06-03 01:01:28 +02:00
icewind1991
2a81813e44 Merge pull request #3051 from owncloud/backgroundjob
Reworked background job system.
2013-06-02 14:29:59 -07:00
Frank Karlitschek
9392d2d58e Merge pull request #3567 from owncloud/fixing-3466
In cases where smb4php returns false of an empty array stat/( has to ret...
2013-06-02 14:04:55 -07:00
Robin Appelman
24ab525669 Use int for last_run 2013-06-02 22:49:54 +02:00
Robin Appelman
38bd234686 make sure the filesystem is setup before doing mount operations 2013-06-02 22:09:44 +02:00