phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,258 Commits 3 Branches 0 Tags
cb484a9d470b1d2919635d7c653606b589782aba
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell cb484a9d47 fix conflicts. 2014-11-30 20:28:34 -06:00
Taylor Otwell 4afcd8c278 Merge pull request #3136 from melvinsh/patch-1 
Removed unnecessary 'else' statement
 2014-11-30 20:27:29 -06:00
Taylor Otwell 662bc27468 Merge pull request #3153 from Codeklopper/patch-2 
Unused exception reference
 2014-11-30 20:26:33 -06:00
Taylor Otwell 57a6e1ce72 Remove properties. 2014-11-30 19:55:11 -06:00
Taylor Otwell 5194a437d5 Add a note to the AppServiceProvider. 2014-11-30 14:12:20 -06:00
Taylor Otwell 6b939c477c Tweak some wording. 2014-11-29 20:14:23 -06:00
Taylor Otwell 50bdd8e33a Some wording. 2014-11-29 16:57:46 -06:00
Taylor Otwell 7afa27927f Tweak some wording. 2014-11-29 15:48:27 -06:00
Taylor Otwell 7ba858ddf1 Working on some customization. 2014-11-29 14:11:26 -06:00
Taylor Otwell 9083f48e97 Working on removing authentication boilerplate. 2014-11-29 13:55:38 -06:00
Taylor Otwell e0afdf4c51 Change some CSS. 2014-11-28 14:24:24 -06:00
Taylor Otwell e558ac6eb2 Change wording. 2014-11-26 11:34:18 -06:00
Taylor Otwell 6f7a0c3a05 Change wording. 2014-11-25 15:43:04 -06:00
Taylor Otwell da0e510872 Cleaning up auth code. 2014-11-25 15:12:16 -06:00
Taylor Otwell 1dd13fcad4 Craft 2014-11-25 14:46:41 -06:00
Taylor Otwell a515125be4 Go exploring. 2014-11-25 14:46:15 -06:00
Taylor Otwell f427384079 Cleaning up view. 2014-11-25 14:45:25 -06:00
Taylor Otwell 6cb2e544ef No borders around circles. 2014-11-25 14:43:59 -06:00
Taylor Otwell c03b6c81e7 Fix spacing a bit. 2014-11-25 14:38:04 -06:00
Taylor Otwell ff08741f69 Spacing. 2014-11-25 14:37:52 -06:00
Taylor Otwell e4c8025b46 Tweak spacing a hair. 2014-11-25 14:37:23 -06:00
Taylor Otwell 9620767935 Change wording. 2014-11-25 14:36:36 -06:00
Taylor Otwell 9aa3b0888d Remove space. 2014-11-25 14:35:31 -06:00
Taylor Otwell 7a5bf6f554 Merge branch 'develop' of github.com:laravel/laravel into develop 
Conflicts:
	public/css/app.css
	resources/assets/sass/app.scss
	resources/assets/sass/pages/_welcome.scss
	resources/views/layouts/app.blade.php
	resources/views/welcome.blade.php
 2014-11-25 14:34:26 -06:00
Taylor Otwell 75e2aca9af Working on default layout. 2014-11-25 14:31:22 -06:00
Taylor Otwell 3c0a1cfb4b Use home as view. 2014-11-25 11:38:04 -06:00
Taylor Otwell 372a6d4907 List null driver in list of queue drivers. 2014-11-25 09:31:10 -06:00
Taylor Otwell 16357ad29b Authorize all requets. 2014-11-25 09:20:56 -06:00
Taylor Otwell d306965007 Organize requests differently. 2014-11-25 09:20:26 -06:00
Taylor Otwell 634c96d8d9 Rename dashboard to home. 2014-11-24 19:33:07 -06:00
Taylor Otwell 7a7e366da5 Simplify validation on register stuff. 2014-11-24 14:25:44 -06:00
Taylor Otwell 4803d6c8e2 Moe default requests. 2014-11-24 13:59:40 -06:00
Taylor Otwell a9c9b202b0 Remove comment. 2014-11-24 12:24:01 -06:00
Taylor Otwell da9dd7d389 Respect remember me setting. 2014-11-24 12:21:06 -06:00
Taylor Otwell 769f2486ef Fixed some fonts. 2014-11-24 12:16:08 -06:00
Taylor Otwell f8aeffc76a Tweak welcome view. 2014-11-24 11:47:49 -06:00
Taylor Otwell e0c54591bf Include built scripts by default so things work out of box. 2014-11-24 11:46:00 -06:00
Taylor Otwell 163e51640e Merge branch 'develop' of github.com:laravel/laravel into develop 
Conflicts:
	gulpfile.js
 2014-11-24 11:44:03 -06:00
Taylor Otwell fa978d0525 Working on default app structure. Login views. 2014-11-24 11:42:29 -06:00
Taylor Otwell b73e127ed0 Just use one controller call. 2014-11-22 11:33:18 -06:00
Taylor Otwell 9107969da1 Trailing EOF break. 2014-11-21 15:40:41 -06:00
Taylor Otwell 059b0ba799 Fixing a few things. 2014-11-21 15:03:13 -06:00
Taylor Otwell 3a2dd312be Fix comment. 2014-11-21 08:20:05 -06:00
Taylor Otwell 32fd6ca3d7 Remove comment. 2014-11-21 08:17:13 -06:00
Taylor Otwell 80fb944e45 Remove the server file. 2014-11-20 19:53:24 -06:00
Taylor Otwell 91f174821f Stub SES configuration. 2014-11-19 23:36:45 -06:00
Taylor Otwell f9d4bcd13d Change default Elixir file. 2014-11-19 21:21:04 -06:00
Taylor Otwell 29ad85dbd1 Change wording. 2014-11-19 21:16:59 -06:00
Taylor Otwell abaee25b56 Add clarification to comment. 2014-11-19 20:00:42 -06:00
Taylor Otwell 2e0afb9bf1 Fix a few comments for wording. 2014-11-19 19:59:36 -06:00
Taylor Otwell 994e099928 Update syntax. 2014-11-19 19:49:18 -06:00
Taylor Otwell 8b70eabf39 Update the app skeleton. 2014-11-19 19:45:46 -06:00
Taylor Otwell 6b60dc6650 Fix handler. 2014-11-19 09:03:05 -06:00
Taylor Otwell 536fe29b6b Remove extra semicolon. 2014-11-19 08:15:55 -06:00
Taylor Otwell 313abe624d Use real command name. 2014-11-18 23:12:28 -06:00
Taylor Otwell 71a8e00f26 Merge branch 'schedule' into develop 2014-11-18 22:48:49 -06:00
Taylor Otwell a7e6a89c91 Add scheduled commands. 2014-11-18 22:48:38 -06:00
Taylor Otwell 9a0612fc26 Separate namespaces for when app is named. 2014-11-14 16:44:01 -05:00
Taylor Otwell e3e7cc499f Set the root controller namespace. 2014-11-11 20:10:53 -06:00
Taylor Otwell ca2f02284c Rename middleware to more "action" words. 2014-11-11 12:51:55 -06:00
Taylor Otwell d2aebd283e Rename middleware. 2014-11-11 10:27:30 -06:00
Taylor Otwell e02e3456ed Update middleware reference. 2014-11-10 13:43:44 -06:00
Taylor Otwell a98c0d64c7 Move middleware. 2014-11-10 13:38:19 -06:00
Taylor Otwell 97287c89fe Update middleware. 2014-11-10 13:25:08 -06:00
Taylor Otwell 2cb7450aaf modify contract. 2014-11-10 11:51:42 -06:00
Taylor Otwell 6e0a5603fe Update middleware list. 2014-11-10 10:20:41 -06:00
Taylor Otwell bdb839222d Check type of token. 2014-11-09 16:31:08 -06:00
Taylor Otwell ba0cf2a1c9 Check type of token as well. 2014-11-09 16:29:56 -06:00
Taylor Otwell 0a01aca6b4 Use the console kernel. 2014-11-07 11:56:21 -06:00
Taylor Otwell f66122149a Bootstrap the application when testing. 2014-11-07 10:07:31 -06:00
Taylor Otwell 55965c73c5 Rename. 2014-11-07 10:00:30 -06:00
Taylor Otwell 929e638c7e Rename traits. 2014-11-07 09:39:01 -06:00
Taylor Otwell 3c9d67ad65 Remove some stuff from .gitignore. 
Let people define their own global .gitignore file. Also people keep
complaining that composer.lock is in this file.
 2014-11-06 20:51:39 -06:00
Taylor Otwell 46d1a27b77 Terminate the request after sending. 2014-11-06 20:06:49 -06:00
Taylor Otwell 4b2694ce76 Fix file. 2014-11-06 13:17:58 -06:00
Taylor Otwell 33efefa388 Fix redirects. 2014-11-06 13:16:29 -06:00
Taylor Otwell c17925bce4 Merge pull request #3108 from pascalschwientek/patch-1 
minor spelling/grammar corrections
 2014-11-06 13:14:47 -06:00
Taylor Otwell 754ea2656c Tweak wording. 2014-11-06 13:11:17 -06:00
Taylor Otwell 0c3f1c967c Merge pull request #3118 from miclf/patch-1 
Prevent TokenMismatchException for HTTP OPTIONS requests
 2014-11-06 13:10:14 -06:00
Taylor Otwell 10452da7b5 Merge pull request #3112 from nblackburn/patch-1 
Updated CSRF middleware reference
 2014-11-06 08:57:24 -06:00
Taylor Otwell fcca359778 Working on middleware. 2014-11-05 11:18:00 -06:00
Taylor Otwell d5e5947a6a Add to compile. 2014-11-05 10:19:15 -06:00
Taylor Otwell a8e4f23126 Merge branch 'config' into develop 2014-11-05 10:19:02 -06:00
Taylor Otwell a280988eef Stub out an app service provider. 2014-11-05 10:18:53 -06:00
Taylor Otwell a59a1416cb Merge pull request #3106 from hannesvdvreken/patch-2 
fix php artisan serve functionality with hardcoded values
 2014-11-05 09:48:05 -06:00
Taylor Otwell c494e83193 Merge pull request #3114 from matism/develop 
new logout-method naming
 2014-11-05 09:42:28 -06:00
Taylor Otwell 27aa85ccdb Remove exception handler. Move to core. 2014-11-03 19:13:06 -06:00
Taylor Otwell 1209ce7657 Working on exception handling. WIP. 2014-11-03 16:45:26 -06:00
Taylor Otwell 3c614ac5d6 Working on logging. 2014-11-03 10:26:04 -06:00
Taylor Otwell 9bc7c00df9 Add logs directory. 2014-11-03 09:06:02 -06:00
Taylor Otwell 007040e2ae Remove scan arrays. 2014-11-02 13:15:12 -06:00
Taylor Otwell ed4b97b33b Working on structure. 2014-11-02 10:22:56 -06:00
Taylor Otwell c398cda797 Tweak default request setup. 2014-11-02 10:21:14 -06:00
Taylor Otwell 5d8af6099e Remove extra line. 2014-11-02 10:09:55 -06:00
Taylor Otwell 0ee0c434a3 Changing default routing setup. 2014-11-02 10:02:20 -06:00
Taylor Otwell aa8bf8a211 Bind the kernels as singletons. 2014-10-25 21:27:57 -05:00
Taylor Otwell 657033afa8 Merge pull request #3087 from fungku/develop 
Rename Gulpfile.js to gulpfile.js
 2014-10-22 19:16:35 -05:00
Taylor Otwell 3a844756fe Merge pull request #3091 from GrahamCampbell/patch-1 
Fixed RouteServiceProvider docblocks
 2014-10-22 19:16:17 -05:00
Taylor Otwell 36e0014a6a Fix a few password reminder things. 2014-10-22 19:16:05 -05:00
Taylor Otwell c10ad6269e Remove log service provider since it is part of Bootstrap process. 2014-10-21 21:57:39 -05:00