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

86 commits

Author SHA1 Message Date
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Lukas Reschke
283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada Migrate to SwiftMail 
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
 2015-03-16 12:47:05 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Lukas Reschke
ba29ea178f Add unit tests for empty token 2015-02-01 17:34:03 +01:00
Lukas Reschke
35afb0d22e Default to null for lostpassword 
We oC 8 we use the `StringUtils::equals` method which will also verify the type, since we don't anylonger hash the token twice this is required in case somebody is able to invoke this route with an empty `$token`.
 2015-02-01 17:07:10 +01:00
Morris Jobke
345eb62ffa center spinner 2014-11-18 10:25:16 +01:00
Lukas Reschke
9eeea57e3a Show spinner 2014-11-17 17:50:25 +01:00
Bjoern Schiessle
11ab457b72 add password as parameter to the signal so that the encryption can create a new key-pair 2014-11-17 17:50:19 +01:00
Lukas Reschke
357465eac9 Add "postPasswordReset" hook 2014-11-17 17:50:19 +01:00
Lukas Reschke
767b08c669 Use correct route instead 
THX @schiesbn
(I should setup a mail server on my local system...)
 2014-11-17 17:50:19 +01:00
Lukas Reschke
57b5c82eb7 Remove uneeded import 2014-11-17 17:50:19 +01:00
Lukas Reschke
1b50d4f7ce Warn for password reset when files_encryption is enabled 
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.

Furthermore I updated the code to use our new classes and added some unit tests for it 👯

Fixes https://github.com/owncloud/core/issues/11438
 2014-11-17 17:50:19 +01:00
Lukas Reschke
f33312f767 Use AppFramework instead of custom controller 2014-08-25 11:50:19 +02:00
Thomas Müller
a8b6cc6a07 - adding default value for $recoveryPassword 
- set password correctly in lost password
 2014-07-24 12:50:39 +02:00
Morris Jobke
dda5e6c85b add proper Exception message for invalid token 2014-06-13 16:18:58 +02:00
Morris Jobke
1cb7239cb7 use array_merge for merging arrays in PHP 2014-06-13 16:18:39 +02:00
Morris Jobke
ed8b7fc101 complete renaming uid to userId 2014-06-13 16:18:21 +02:00
Morris Jobke
a53cfcb9d1 Migrate ´ to ' 2014-06-13 16:02:41 +02:00
Morris Jobke
cedca03ef5 Remove infield label, add password icon, fix layout 2014-06-13 15:56:21 +02:00
Morris Jobke
d0b71dffca reformat method call and fix paranthesis mismatch 2014-06-13 15:39:44 +02:00
Bernhard Posselt
2b2b1b487c more style fixes 2014-06-13 15:34:52 +02:00
Bernhard Posselt
a6e45a8d0e use more stuff from core :) 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
e026b1dc19 Add missing use 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
59ff71f781 Fix check for user existence 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
47c6fd0c85 Remove debug output 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
4b359ad20c Change routes. Update templates 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
218d0add36 Changes according to review 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
a7fbd91e53 Use appframework 2014-06-13 15:34:52 +02:00
Victor Dubiniuk
23ed038a27 Basics 2014-06-13 15:34:51 +02:00
Jan-Christoph Borchardt
4ef94ddd2e infield label removal: remove last occurences of infield labels 2014-06-03 15:30:09 +02:00
Volkan Gezer
46555b50a1 fix warning text and margin 2014-05-27 12:29:08 +02:00
Lukas Reschke
35ee1e902a Replace echo with p or print_unescaped 
Using echo instead of `p` or `print_unescaped` is a bad style, to prevent people from copying it  I've adjusted it.
 2014-04-04 22:23:23 +02:00
Joas Schilling
922c1909f8 Translate string when an error occured while sending a forgot password mail 
Fix #7423
 2014-02-26 17:29:47 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Morris Jobke
ffbcfef614 fix lost password screen - reuse available CSS rules 2013-10-29 13:42:39 +01:00
Julian Müller
776346b503 Fixing the lost Password Screen 2013-10-29 01:33:12 +01:00
Julian Müller
e9caaa933c Fixing the Lost Password Screen 2013-10-29 01:29:38 +01:00
Thomas Müller
e43e8b0db8 Merge branch 'master' into rename-lostpassword-controller 
Conflicts:
	core/lostpassword/controller.php
 2013-09-04 20:46:32 +02:00
Bart Visscher
5539b9e843 Use the namespaced variation of the classname. 2013-09-02 21:25:32 +02:00
kondou
f1518a54df Merge branch 'master' into clean_up_util 
Conflicts:
	lib/util.php
 2013-08-20 17:20:30 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
kondou
9c5416fe4a Clean up \OC\Util 
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
 2013-08-15 15:57:32 +02:00
Myles McNamara
f5d23c469d use getName instead of getTitle 2013-08-08 16:21:47 -04:00
Myles McNamara
74a264e82e fix syntax error 
accidentally had ; included, and changed concatenating
 2013-08-03 18:47:27 -04:00
Myles McNamara
8edc0f210b use theme name and title for password reset 
password reset email uses owncloud, updated to use theme settings
 2013-08-03 00:00:32 -04:00
Björn Schießle
99008ace36 fixed enghlish sentence, thanks to @MTGap 2013-06-19 12:05:45 +02:00
Björn Schießle
7f6a9e8fef fix lost password page, don't show checkbox is encryption is not enabled 2013-06-19 11:48:09 +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