Commit Graph

557 Commits

Author SHA1 Message Date
Alex Bilbie
6d1702a15d Merge branch 'develop' into feature/clients 2012-09-19 23:29:40 +01:00
Alex Bilbie
500640c56c phpunit/phpunit is now officially composer compatible
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 22:04:18 +01:00
Alex Bilbie
7d50b8e812 Moved SQL files
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:59:00 +01:00
Alex Bilbie
43ce218cbb Merge branch 'release/0.2.3' into develop 2012-09-19 19:54:30 +01:00
Alex Bilbie
5b870a84f8 Merge branch 'release/0.2.3' 2012-09-19 19:54:20 +01:00
Alex Bilbie
7e009a2d02 Version number bump + email change
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:54:11 +01:00
Alex Bilbie
602bc85121 Merge branch 'hotfix/auth-exceptions' into develop 2012-09-19 19:53:16 +01:00
Alex Bilbie
e567866a01 Merge branch 'hotfix/auth-exceptions' 2012-09-19 19:53:05 +01:00
Alex Bilbie
3c2720ece4 Renamed exceptions
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:52:52 +01:00
Alex Bilbie
1440a5e46c Added a .gitattributes file
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:48:32 +01:00
Alex Bilbie
0db10063ac Merge branch 'refs/heads/master' into develop 2012-09-19 19:34:17 +01:00
Alex Bilbie
9844613b2d Fixed test checks
Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:34:05 +01:00
Alex Bilbie
ed2cabc5b6 Merge branch 'master' of github.com:lncd/OAuth2
Conflicts:
	composer.json

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
2012-09-19 19:32:31 +01:00
Alex Bilbie
926034c824 Pulled latest changes 2012-09-19 19:30:35 +01:00
Alex Bilbie
e965bfdeb5 Merge branch 'release/0.2.2' into develop 2012-09-19 19:29:27 +01:00
Alex Bilbie
085f849855 Merge branch 'release/0.2.2' 2012-09-19 19:29:18 +01:00
Alex Bilbie
6ea2f6480d version number bump 2012-09-19 19:29:14 +01:00
Alex Bilbie
f75fef179a Merge branch 'hotfix/resource-fixes' into develop 2012-09-19 19:27:58 +01:00
Alex Bilbie
a6cfd40b0f Merge branch 'hotfix/resource-fixes' 2012-09-19 19:27:32 +01:00
Alex Bilbie
3f3b987fb1 Check responses from the database are valid 2012-09-19 19:27:04 +01:00
Alex Bilbie
bdbf9072f6 Update README.md 2012-09-07 12:59:41 +02:00
Alex Bilbie
c993a0cdc0 Use namespace, use PSR, get rid of Pyro settings 2012-09-04 14:50:20 +01:00
Alex Bilbie
9dfa485bcb PSR fixes 2012-09-04 14:49:56 +01:00
Alex Bilbie
c760667448 PSR style class braces 2012-09-04 12:43:18 +01:00
Alex Bilbie
0298f6fb7d Include IDP.php 2012-09-04 12:42:33 +01:00
Alex Bilbie
17b7bf7d1d Test if provider config exists 2012-09-04 12:40:32 +01:00
Alex Bilbie
ed6301a497 Renamed provider.php to IDP.php 2012-09-04 12:40:02 +01:00
Alex Bilbie
c423ef810f Require instead of include 2012-09-04 12:33:17 +01:00
Alex Bilbie
485a3772b6 Changed function to __construct 2012-09-04 12:32:59 +01:00
Alex Bilbie
6f03eec814 Class rename 2012-09-04 12:32:44 +01:00
Alex Bilbie
0a5455642f PSR style if/else block 2012-09-04 12:31:04 +01:00
Alex Bilbie
8fdcb02740 Exception class rename 2012-09-04 12:30:49 +01:00
Alex Bilbie
153bb962c5 PSR variable rename 2012-09-04 12:30:38 +01:00
Alex Bilbie
3ee5f22a55 Class rename 2012-09-04 12:30:15 +01:00
Alex Bilbie
c09663f2b8 Class rename 2012-09-04 12:30:06 +01:00
Alex Bilbie
6a41ae5254 PSR style if block 2012-09-04 12:29:52 +01:00
Alex Bilbie
dd5fc7dc24 PSR variable rename 2012-09-04 12:29:10 +01:00
Alex Bilbie
11415bea0b PSR style if/else block 2012-09-04 12:28:28 +01:00
Alex Bilbie
eb5010a3f8 PSR variable rename 2012-09-04 12:28:06 +01:00
Alex Bilbie
da329b6b37 Merge branch 'refs/heads/develop' into feature/clients
Conflicts:
	src/Oauth2/Authentication/Server.php
2012-09-04 12:09:13 +01:00
Alex Bilbie
248b09641d Merge branch 'hotfix/0.2.1' into develop 2012-08-28 12:31:36 +01:00
Alex Bilbie
0af98224dd Merge branch 'hotfix/0.2.1' 2012-08-28 12:31:07 +01:00
Alex Bilbie
88185320a8 Version bump 2012-08-28 12:30:58 +01:00
Alex Bilbie
a1e5fdddda Bug fix 2012-08-28 12:30:51 +01:00
Alex Bilbie
58d0a988a9 Merge branch 'release/0.2' into develop 2012-08-27 16:05:50 +01:00
Alex Bilbie
d9c4962380 Merge branch 'release/0.2' 2012-08-27 16:05:30 +01:00
Alex Bilbie
db7eddb4ea Updated version number 2012-08-27 16:05:20 +01:00
Alex Bilbie
4d4db99c06 Underscored private variables and methods and updated references 2012-08-27 16:02:54 +01:00
Alex Bilbie
b485f15e83 Fixed reference to renamed methods and properties 2012-08-27 16:02:35 +01:00
Alex Bilbie
c92dc8f759 Merge branch 'release/0.1' into develop 2012-08-27 15:52:21 +01:00