Jörn Friedrich Dreyer
86c5243be5
remove duplicate logging from db.php, now happens in entrypoints
2013-06-10 14:03:12 +02:00
Jörn Friedrich Dreyer
8dc6bdd96b
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer
c0bdbd9d81
introduce and use executeAudited in db.php
2013-06-10 12:56:45 +02:00
Björn Schießle
13017ce9e1
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
Jörn Friedrich Dreyer
d264d0a79d
Merge pull request #3648 from owncloud/sql_limit_as_param
...
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
Jörn Friedrich Dreyer
fc27052887
shorten table identifiers in tests
2013-06-10 11:44:04 +02:00
Björn Schießle
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Jörn Friedrich Dreyer
5ec13742b3
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-10 10:33:02 +02:00
Jörn Friedrich Dreyer
b6f8d2b859
raise failed tests from first commit to size @medium
2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer
73fb722a9e
add timeouts 3/30/90 to phpunit tests
2013-06-10 09:31:22 +02:00
Jenkins for ownCloud
b237d03791
[tx-robot] updated from transifex
2013-06-10 02:06:36 +02:00
Jenkins for ownCloud
78286d0262
[tx-robot] updated from transifex
2013-06-09 02:06:21 +02:00
infoneo
199207253e
Update mapper.php
2013-06-08 19:44:58 +03:00
infoneo
b39113ae3e
Update mapper.php
...
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
Jenkins for ownCloud
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
Björn Schießle
b25ab94a08
only check for recovery key if someone else than the user wants to change the password
2013-06-07 20:17:48 +02:00
Michael Gapczynski
9ef989f917
Merge pull request #2919 from owncloud/hook-improvements
...
Hook improvements
2013-06-07 06:35:50 -07:00
Morris Jobke
1cace9b0a3
Merge pull request #3628 from owncloud/update_3rdparty_submodule
...
update 3rdparty submodule
2013-06-07 02:43:22 -07:00
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 Mueller
d921004a6e
ignore l10n folder within remaining apps
2013-06-04 00:04:17 +02:00
