Commit Graph

3945 Commits

Author SHA1 Message Date
Taylor Otwell ba0cf2a1c9 Check type of token as well. 2014-11-09 16:29:56 -06:00
Taylor Otwell 5eb4d0afd7 Merge pull request #3048 from lucidlogic/master
minor grammar corrections
2014-10-02 20:33:29 -05:00
Gareth Edwards cbfa5af920 minor spelling/grammar corrections 2014-10-01 09:11:03 +02:00
Taylor Otwell 462b91157b Merge pull request #2960 from josezenem/master
Missing validation sentence for timezone.
2014-08-22 08:34:03 -05:00
Taylor Otwell b363f3d195 Merge pull request #2964 from cjaoude/master
Add missing 'reminders.reset' message.
2014-08-22 08:32:50 -05:00
Taylor Otwell 55053de667 Merge pull request #2971 from barryvdh/patch-3
Add type 'project' to composer.json
2014-08-22 08:29:35 -05:00
Barry vd. Heuvel c4bb1b8e59 Add type 'project' to composer.json
That is what is suggested by https://getcomposer.org/doc/04-schema.md#type
2014-08-21 09:43:18 +02:00
Christopher Jaoude 9f31eede29 Add missing 'reminders.reset' message. 2014-08-12 18:07:24 -04:00
Jose Jimenez e493e113ef Missing validation sentence for timezone.
When using the timezone validation, it does not have a default sentence, you are greeted with: "validation.timezone" instead.
2014-08-06 11:30:27 -07:00
Taylor Otwell 8e468bcbf7 Merge branch 'master' of github.com:laravel/laravel 2014-08-02 21:39:34 -05:00
Benjamin Worwa e62ff82631 Create .gitignore
Why aren't we ignoring sqlite databases at this point?
2014-08-01 01:25:07 -05:00
Taylor Otwell f4e091ff00 Merge pull request #2951 from bworwa/patch-1
Create .gitignore
2014-07-11 20:48:49 -05:00
Taylor Otwell 5d7f9b2188 Merge pull request #2947 from briankiewel/patch-1
spacing cleanup
2014-07-05 13:04:02 -05:00
Benjamin Worwa ac096a29e3 Create .gitignore
Why aren't we ignoring sqlite databases at this point?
2014-07-01 11:55:05 -04:30
Taylor Otwell a914718a57 Update validation.php 2014-06-06 19:09:27 -05:00
Taylor Otwell 8e43b1360a Merge pull request #2948 from TheShiftExchange/patch-1
Update validation language to include boolean
2014-06-06 19:09:03 -05:00
Laurence Ioannou df18065dff Update validation.php
Language validation addition for https://github.com/laravel/framework/pull/4599
2014-06-07 00:42:59 +10:00
Brian Kiewel 7e4107d453 spacing cleanup 2014-06-04 20:40:30 -04:00
Taylor Otwell 1713d69ca8 Merge development branch. 2014-06-01 13:16:30 -05:00
Taylor Otwell 3ea3cc6287 Merge branch 'master' into develop 2014-06-01 13:15:50 -05:00
Taylor Otwell 5a7d9a0c25 Fix wording. 2014-05-30 14:39:17 -05:00
Taylor Otwell a6a01b976c Merge pull request #2851 from juukie14/user-model-hidden
Added remember_token to protected $hidden variable
2014-05-30 14:38:34 -05:00
Taylor Otwell 486cd4b257 Merge pull request #2853 from anewmanjones/patch-1
Fix grammar in config/mail.php
2014-05-30 14:38:09 -05:00
Taylor Otwell f9ce5f9c50 Merge pull request #2854 from seeARMS/patch-1
Added redis to list of available queue drivers
2014-05-30 14:36:06 -05:00
Taylor Otwell e3cb29a397 Merge pull request #2929 from barryvdh/patch-3
Add note about expire time
2014-05-30 13:59:01 -05:00
Taylor Otwell 01e009a438 Merge branch 'master' into develop 2014-05-28 23:05:16 -05:00
Taylor Otwell f1fe4efc50 Merge pull request #2935 from GrahamCampbell/badges
Updated Badges
2014-05-28 23:04:38 -05:00
Graham Campbell 9fd86c40b4 Updated badges 2014-05-27 15:47:53 +01:00
Barry vd. Heuvel 3bab2d4487 Add note about expire time
Might be confusing for users, if the expire time is not stated.
2014-05-23 10:57:57 +02:00
Taylor Otwell 6f005892b0 Cleaning up some default values. 2014-05-16 10:44:00 -04:00
Taylor Otwell 0935b0422e Merge branch 'upcoming' into develop 2014-05-15 23:02:55 -04:00
Taylor Otwell c7ff71111b Change namespace for RemindableTrait. 2014-05-13 08:14:16 -05:00
Taylor Otwell b9c69c6d94 Change local database user. 2014-05-12 13:34:01 -05:00
Taylor Otwell ca651a7815 Configure default database connections for Forge and Homestead. 2014-05-10 20:05:56 -05:00
Taylor Otwell 5b811e308a Merge pull request #2884 from crynobone/feature/service-mailgun-domain
Add missing mailgun.domain option.
2014-05-05 19:05:36 -05:00
Taylor Otwell 9df2e2343e Merge pull request #2885 from GrahamCampbell/badges
[4.1] Improved Badges
2014-05-05 19:04:02 -05:00
Graham Campbell 57b53c2d73 Improved badges 2014-05-04 16:48:58 +01:00
crynobone ffe21c53e1 Add missing mailgun.domain option.
Signed-off-by: crynobone <crynobone@gmail.com>
2014-05-04 10:31:36 +08:00
Taylor Otwell 6983f4d177 De-clutter default models. 2014-05-02 09:28:10 -05:00
Colin Work 3e29d06708 Added redis to list of available queue drivers 2014-04-22 10:14:03 -04:00
anewmanjones ad33b2f884 Fix grammar in config/mail.php 2014-04-22 13:32:37 +01:00
Juukie14 65db159b2d Added remember_token to protected $hidden variable 2014-04-21 20:58:38 +02:00
Taylor Otwell 443cad582c Merge branch 'master' into develop 2014-04-19 16:59:29 -05:00
Taylor Otwell 13a34ff883 Update badges. 2014-04-19 16:59:13 -05:00
Taylor Otwell b8c57358d9 Merge branch 'master' into develop 2014-04-19 09:55:16 -05:00
Taylor Otwell f138f0f4fc Add extra functions to User. 2014-04-15 11:06:27 -05:00
Taylor Otwell cfd7b5842d Merge branch 'master' into develop 2014-04-15 08:35:19 -05:00
Taylor Otwell dff012070e Disable debugging by default. Must opt-in for local. 2014-04-15 08:34:30 -05:00
Taylor Otwell af70922759 Merge pull request #2726 from lucasmichot/patch-1
[PROPOSAL] Ignore all .env.*.php files
2014-04-11 17:23:11 -05:00
Taylor Otwell 211dfc24e7 Merge branch 'master' into develop 2014-04-11 17:17:20 -05:00