phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,950 Commits 3 Branches 0 Tags
3a34a99694c68256be700fa7e6d7553ad9256994
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 3a34a99694 Working on default route setup. 2014-08-01 23:51:30 -05:00
Taylor Otwell c4babe0a07 Merge branch 'master' into develop 2014-08-01 01:28:10 -05:00
Taylor Otwell 4b117a6ea8 Fix a few things. 2014-08-01 00:55:37 -05:00
Taylor Otwell 1a0b1cc08e Work on inspiring command. 2014-08-01 00:46:47 -05:00
Taylor Otwell 9b00554990 Merging structure branch. 2014-07-31 23:44:43 -05:00
Taylor Otwell c58286aa25 Remove class loader from aliases. 2014-07-31 23:41:39 -05:00
Taylor Otwell 4131fbd4dc Continuing to work on structure. 2014-07-31 22:59:25 -05:00
Taylor Otwell 0e0fd73b43 Working on overall app structure. 2014-07-31 15:13:50 -05:00
Taylor Otwell a5001352e6 Fix autoload map. 2014-07-29 23:52:16 -05:00
Taylor Otwell 812532c688 Rename commands directory. 2014-07-27 14:10:37 -05:00
Taylor Otwell a8a0996faa Tweak default SQLite database. 2014-07-26 22:00:51 -05:00
Taylor Otwell b20409fa53 Move storage out of app directory. 2014-07-26 22:00:01 -05:00
Taylor Otwell 5b82dfb0ed Working on compile config file. 2014-07-18 14:32:47 -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
Taylor Otwell e5fe0aff57 Move the environment settings into their own file. 2014-06-23 21:22:55 -05:00
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
Taylor Otwell d2acaa24c2 Point at 4.3. 2014-06-01 13:16:51 -05: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
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
Taylor Otwell 6983f4d177 De-clutter default models. 2014-05-02 09:28:10 -05: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
Taylor Otwell cb21cb8aa8 Merge pull request #2754 from GrahamCampbell/fixes 
Minor CS Fixes
 2014-04-11 17:17:01 -05:00
Taylor Otwell 7a7835fe5f Merge pull request #2800 from barryvdh/patch-2 
Add fallback_locale to config
 2014-04-11 16:33:19 -05:00
Taylor Otwell 28a95624fe Fix wording. 2014-04-11 16:32:36 -05:00
Taylor Otwell c7dff13401 Merge pull request #2806 from GrahamCampbell/mail 
Added log to the mail config
 2014-04-11 16:30:42 -05:00
Taylor Otwell 4aa42ee280 Set default cipher. 2014-04-11 11:00:57 -05:00
Taylor Otwell 83a872162e Add comment. 2014-03-14 18:59:40 -05:00
Taylor Otwell 571b20c0a7 Fix formatting of file. 2014-03-14 16:22:14 -05:00
Taylor Otwell 7d60aa4235 Working on configuration files. 2014-03-14 16:22:03 -05:00
Taylor Otwell a2cb6049c9 Cleaning up comments. 2014-03-08 15:18:22 -06:00
Taylor Otwell 3c19e7ad4a Merge pull request #2735 from boffey/fix-mail-config-comments 
Updated mail config comments from postmark to mailgun
 2014-03-08 14:58:12 -06:00
Taylor Otwell 0b390e397e Merge branch 'master' into develop 2014-03-03 20:07:50 -06:00
Taylor Otwell 9bf9c2eb42 Add ttr option to beanstalk config. 2014-03-03 20:07:43 -06:00
Taylor Otwell 0c9aded889 Merge branch 'master' into develop 2014-02-28 16:06:05 -06:00
Taylor Otwell fafb9837dd Merge pull request #2715 from EvgenyKovalev/patch-2 
Iron.io config less error prone.
 2014-02-28 16:05:46 -06:00
Taylor Otwell c457a93ddb Work on 401 response from filter. 2014-02-28 16:02:46 -06:00
Taylor Otwell d286d94122 Merge pull request #2399 from JosephSilber/auth-ajax-401 
Auth should respond with a 401 to AJAX requests
 2014-02-28 16:01:32 -06:00
Taylor Otwell 5a172d90d3 Merge pull request #2687 from EvgenyKovalev/patch-2 
5x boost for EU customers
 2014-02-28 15:01:32 -06:00
Taylor Otwell 36260876dd Add sample custom error message. 2014-02-28 14:58:02 -06:00
Taylor Otwell a2574209b3 Tweak wording. 2014-02-28 14:50:25 -06:00
Taylor Otwell 151fdab5fe Merge pull request #2706 from idhamperdameian/master 
Add required_with_all validation message
 2014-02-28 14:49:40 -06:00
Taylor Otwell 945a073879 Merge pull request #2710 from webdrop/master 
added alt to img tag in hello
 2014-02-28 14:45:21 -06:00
Taylor Otwell b755783714 Adding soft deleting trait alias. 2014-02-28 11:40:05 -06:00
Taylor Otwell 98d160dc5b Merge pull request #2655 from alexandre-butynski/patch-1 
Improvement of validation traduction for "email" rule
 2014-02-14 22:44:15 -06:00
Taylor Otwell 46c7f075ab Merge pull request #2389 from anlutro-pull-requests/validator-require-without-all 
Added required_without_all
 2014-01-31 09:42:03 -08:00
Taylor Otwell d0c500716c Merge pull request #2508 from euantorano/patch-1 
Updating .htaccess for consistency
 2014-01-31 08:52:00 -08:00
Taylor Otwell cc7196c5e9 Add encrypt option to iron queue config. 2014-01-21 13:31:14 -06:00
Taylor Otwell 08afd1f2f7 Merge branch 'master' into develop 2014-01-18 21:58:34 -06:00
Taylor Otwell aeda6b13cd Shorten path line. 2014-01-18 21:58:28 -06:00
Taylor Otwell ca744fc345 Merge pull request #2612 from liuggio/patch-1 
added license badge
 2014-01-18 19:31:40 -08:00
Taylor Otwell 437ea54681 Merge branch 'master' into develop 2014-01-18 19:15:48 -06:00
Taylor Otwell 73094f2633 Ignore environment files. 2014-01-18 19:14:57 -06:00
Taylor Otwell 702388461a Update composer.json 2014-01-10 20:18:00 -06:00
Taylor Otwell 69bb62333b Merge pull request #2534 from a25ce1/patch-1 
tabs to spaces
 2014-01-09 19:36:31 -08:00
Taylor Otwell c420a7b8bf Merge branch 'master' into develop 2014-01-09 21:31:24 -06:00
Taylor Otwell b6962878fe Remove makeshift upgrade guide. Docs should be used. 2014-01-09 21:31:18 -06:00
Taylor Otwell adfa89b9b2 Merge pull request #2560 from crynobone/feature/post-install-cmd 
Add php artisan clear-compiled to post-install-cmd
 2014-01-07 21:30:05 -08:00
Taylor Otwell 85f096b5d7 Minimum stability stable. 2013-12-12 09:28:04 -06:00
Taylor Otwell bc52ed5e3f Up dependency on dev branch. 2013-12-12 09:24:38 -06:00
Taylor Otwell 3053d486e6 Fix conflict. 2013-12-11 08:17:46 -06:00
Taylor Otwell c1ab700b65 Merge pull request #2480 from samchivers/patch-1 
Corrected the spelling of 'maintenance' in maintenance mode comment block
 2013-12-11 06:16:04 -08:00
Taylor Otwell 0293eaced7 Mention redis connection. 2013-12-08 22:48:04 -06:00
Taylor Otwell d763a8a6d9 Merge pull request #2471 from adamgoose/develop 
Enhancements to the 4.0>4.1 upgrade guide.
 2013-12-05 17:54:27 -08:00
Taylor Otwell b2cad30502 Merge pull request #2470 from adamgoose/develop 
Re-order upgrade instructions
 2013-12-05 11:26:12 -08:00
Taylor Otwell b83290e599 Merge pull request #2455 from irazasyed/patch-1 
Added new steps - upgrade.md
 2013-11-28 16:49:26 -08:00
Taylor Otwell 074d0f0868 Merge pull request #2453 from bretterer/patch-1 
Added step to add remote.php
 2013-11-28 09:54:11 -08:00
Taylor Otwell d4c5a0fd8f Merge pull request #2440 from crynobone/patch/upgrade 
Group similar upgrade task.
 2013-11-27 09:47:17 -08:00
Taylor Otwell a297fe8389 Update upgrad guide. 2013-11-27 11:41:01 -06:00
Taylor Otwell 0301a564e5 Tweak comment. 2013-11-27 11:40:44 -06:00
Taylor Otwell df6e4a973b Merge pull request #2446 from seengee/develop 
Added instruction to update composer.json to 4.1
 2013-11-27 09:38:51 -08:00
Taylor Otwell 9186d7a31d Adding failed queue job options. 2013-11-26 10:11:29 -06:00
Taylor Otwell 1ac38202de Added stub keyphrase. 2013-11-22 13:40:44 -06:00
Taylor Otwell 3cd00eb7bd Merge pull request #2436 from bryannielsen/patch-1 
Remove duplicate insert of SSH alias
 2013-11-21 08:41:55 -08:00
Taylor Otwell d8270ae52e Merge pull request #2423 from mitchellvanw/develop 
Add Remote component to upgrade
 2013-11-20 18:31:17 -08:00
Taylor Otwell 4e2566632e Merge pull request #2426 from philsturgeon/patch-1 
Missing reference to SSH in upgrade.md
 2013-11-18 08:57:54 -08:00
Taylor Otwell 1fb0a96553 Add to upgrade guide. 2013-11-14 21:36:56 -06:00
Taylor Otwell 55239c4c8a Tweak reminder language lines. 2013-11-14 21:36:12 -06:00