phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,992 Commits 3 Branches 0 Tags
de80aad4ce4f0e26e43f976ee6f2787b4ece4bd4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell de80aad4ce Merge pull request #3854 from jhoff/phpmd_compliance 
Compliance with commonly used phpmd rules
 2016-08-05 09:51:17 -05:00
Taylor Otwell 89a43434e7 fix cons 2016-08-05 09:43:51 -05:00
Taylor Otwell 4c2e1ed7db working on welcome page 2016-08-05 09:43:15 -05:00
Taylor Otwell 6e91cc6ad3 Merge pull request #3861 from laravel/revert-3853-develop 
Revert "Removes padding on html/body to kill the scrollbar"
 2016-08-04 15:50:17 -05:00
Taylor Otwell 88e55f41d2 Revert "Removes padding on html/body to kill the scrollbar" 2016-08-04 15:50:11 -05:00
Taylor Otwell 64ae3d5a7e fix cons 2016-08-04 08:22:36 -05:00
Taylor Otwell 6709c69f3c Merge pull request #3858 from laravel/analysis-XV0reP 
Applied fixes from StyleCI
 2016-08-04 08:22:18 -05:00
Taylor Otwell a39c52c67d remove test code 2016-08-04 08:22:16 -05:00
Taylor Otwell 3807819dd0 Applied fixes from StyleCI 2016-08-04 09:22:13 -04:00
Taylor Otwell 196c267562 resolve conflicts and clean up file 2016-08-04 08:21:57 -05:00
Taylor Otwell 3b2f29ec26 Merge pull request #3853 from jackmcdade/develop 
Removes padding on html/body to kill the scrollbar
 2016-08-04 07:57:29 -05:00
Taylor Otwell 054bb04056 resolve conflicts 2016-08-04 07:50:00 -05:00
Taylor Otwell 5d0ecde4cf get rid of space 2016-08-04 07:49:27 -05:00
Taylor Otwell dfb33e245d Merge pull request #3857 from laravel/analysis-qMe1Y4 
Applied fixes from StyleCI
 2016-08-04 07:49:17 -05:00
Taylor Otwell f89a244c0f Applied fixes from StyleCI 2016-08-04 08:49:12 -04:00
Taylor Otwell d0f90f9bfd Merge branch 'master' into develop 2016-08-04 07:49:02 -05:00
Taylor Otwell 14f79f19e3 Merge pull request #3855 from BartHuis/patch-1 
give newbees a package service providers section, preventing adding after application
 2016-08-04 07:48:41 -05:00
Taylor Otwell ab453a7e82 Add default address in mail config. 2016-08-03 13:16:30 -05:00
Taylor Otwell f2421123e3 Merge pull request #3850 from crynobone/default-app-key 
[5.2] Remove default APP_KEY value
 2016-08-02 07:47:08 -05:00
Taylor Otwell 7f24b9183a working on landing page 2016-08-01 10:54:47 -05:00
Taylor Otwell ca7c973280 fix length 2016-08-01 08:51:52 -05:00
Taylor Otwell 133bd9ddd2 Merge pull request #3841 from ac1982/patch-1 
[5.3] fix wrong spelling
 2016-08-01 09:51:15 -04:00
Taylor Otwell 4c6abcd17d Merge pull request #3845 from mayoz/patch-3 
[5.3] web group sort by name
 2016-08-01 09:46:57 -04:00
Taylor Otwell 5658575212 Merge pull request #3840 from hikouki/master 
Modify post-root-package-install script.
 2016-07-27 23:14:20 -04:00
Taylor Otwell 2a8c38ac31 compile assets 2016-07-26 15:39:57 -04:00
Taylor Otwell 9cce61be27 Merge pull request #3839 from PascaleBeier/develop 
[5.3] Make use of Bootstrap 3.3.7 with jQuery 3 support
 2016-07-26 15:37:39 -04:00
Taylor Otwell 41e2efb0ad update package json 2016-07-25 18:39:48 -04:00
Taylor Otwell 4cc30225ee Tweak stub width. 2016-07-24 23:47:31 -05:00
Taylor Otwell 9659e8db11 Example component. 2016-07-24 23:00:18 -05:00
Taylor Otwell e2b297b9fc Tweak marketing text. 2016-07-24 22:22:23 -05:00
Taylor Otwell 8f66f4b6e9 Tweak default files. 2016-07-24 22:17:23 -05:00
Taylor Otwell eedac025eb Slim down examples. 2016-07-24 20:19:25 -05:00
Taylor Otwell 7bb44a2542 Tweak variables. 2016-07-24 20:07:16 -05:00
Taylor Otwell ff70fac5b8 Fix test. 2016-07-24 15:02:01 -05:00
Taylor Otwell c309b4fda0 add forge to links 2016-07-24 09:20:40 -05:00
Taylor Otwell 40ae68102a tweak variables 2016-07-23 21:19:43 -05:00
Taylor Otwell cfb5a68cd4 work on default styling 2016-07-23 21:17:56 -05:00
Taylor Otwell 1cbbf41c0c Remove some unneeded variables. 2016-07-23 20:23:25 -05:00
Taylor Otwell 6f2541f14f new welcome page 2016-07-23 18:19:10 -05:00
Taylor Otwell e5cb0a350a working on sass 2016-07-23 18:05:38 -05:00
Taylor Otwell 467e00d9d4 working on sass 2016-07-23 18:03:43 -05:00
Taylor Otwell abe35a095c working on sass 2016-07-23 17:51:50 -05:00
Taylor Otwell f41a400cfd Tweak a few variables. 2016-07-23 16:43:11 -05:00
Taylor Otwell 24766d479d redirect to home if authed 2016-07-23 15:39:33 -05:00
Taylor Otwell 592b7a2bd9 add compiled assets 2016-07-23 15:00:53 -05:00
Taylor Otwell 3f5da4fb76 Include the font in the Sass. 2016-07-23 14:56:55 -05:00
Taylor Otwell e9fe020c0c sample js component 2016-07-23 13:40:49 -05:00
Taylor Otwell eb289b4170 tweak js bootstrapping 2016-07-23 12:28:02 -05:00
Taylor Otwell 0699994de0 add files 2016-07-23 11:39:15 -05:00
Taylor Otwell 3f197331b6 bootstrap vue in app.js 2016-07-23 11:39:11 -05:00
Taylor Otwell fd569a3785 Name this option "retry_after" for clarity. 2016-07-22 14:53:03 -05:00
Taylor Otwell 3cc0388ed7 Use expire for consistency. 2016-07-22 14:40:53 -05:00
Taylor Otwell ea52a96386 Remove mandrill as a default configuration since it's fallen out of popularity. 2016-07-21 11:49:28 -05:00
Taylor Otwell 73375150bb Merge remote-tracking branch 'origin/develop' into develop 2016-07-20 16:31:42 -05:00
Taylor Otwell 1cc411d17f remove directories. let them be jit created. 2016-07-20 16:30:46 -05:00
Taylor Otwell 93cdacf32c remove word 2016-07-18 10:41:51 -05:00
Taylor Otwell e34ac8cb30 Merge pull request #3833 from KennedyTedesco/5.3-provider 
[5.3] Remove register() from BroadcastServiceProvider
 2016-07-15 21:59:10 -07:00
Taylor Otwell 517d8d4f2c Remove web config by default. 2016-07-15 18:06:18 -07:00
Taylor Otwell cdbbe862ce Jeffrey says stay with web pack. 2016-07-15 10:07:47 -05:00
Taylor Otwell 203d79fb2c Use rollup by default instead of web pack. 2016-07-15 09:46:10 -05:00
Taylor Otwell 5ccd086552 Remove aliases. 2016-07-14 16:48:59 -05:00
Taylor Otwell dc3d82f03f Add aliases. 2016-07-14 16:48:25 -05:00
Taylor Otwell e7a03b4538 Stop aliasing a bunch of classes by default. 
This is not a breaking change since upgrade aliases will still work.
 2016-07-14 11:27:16 -05:00
Taylor Otwell db5d228f2b Merge pull request #3831 from laravel/analysis-XW6KOy 
Applied fixes from StyleCI
 2016-07-14 09:36:40 -05:00
Taylor Otwell 5183501c1b Applied fixes from StyleCI 2016-07-14 10:36:36 -04:00
Taylor Otwell 7ec26ce916 Tweak location of routes files. 2016-07-14 09:36:17 -05:00
Taylor Otwell 2b05ce3b05 Just use facades in service providers. 2016-07-11 15:44:50 -05:00
Taylor Otwell ebc1be018c update color 2016-07-11 10:39:10 -05:00
Taylor Otwell eb24741ced Default JS file. 2016-07-10 21:07:27 -05:00
Taylor Otwell 05d0058f30 elixir version 2016-07-10 16:54:02 -05:00
Taylor Otwell 15e1abde15 tweak package file 2016-07-10 16:38:48 -05:00
Taylor Otwell 677c1bdef3 import class 2016-07-10 16:35:03 -05:00
Taylor Otwell 173e0efc12 add variables file 2016-07-10 16:28:20 -05:00
Taylor Otwell b5a8c27991 add files 2016-07-10 15:31:28 -05:00
Taylor Otwell 9c817e7aef use new auth features 2016-07-10 15:31:23 -05:00
Taylor Otwell e1696205c7 consistency 2016-07-10 11:35:03 -05:00
Taylor Otwell 4a44a0d3d5 no longer need this trait out of the box 2016-07-10 09:39:37 -05:00
Taylor Otwell 9ecfa9cf8e specify middleware directly 2016-07-10 08:48:46 -05:00
Taylor Otwell d72e3f3af5 fix conflicts 2016-07-09 11:28:21 -05:00
Taylor Otwell 02274da8fd code formatting 2016-07-09 11:27:46 -05:00
Taylor Otwell 98ca59dc8c Merge pull request #3826 from ngyikp/master 
Add a fallback sans-serif font in case the custom font fails to load
 2016-07-05 08:46:57 -05:00
Taylor Otwell ba1e9ad828 Merge pull request #3824 from byCedric/master 
Add language line for file validation rule
 2016-07-01 08:16:37 -05:00
Taylor Otwell c0898cc71a Merge pull request #3823 from crynobone/feature/notification 
[5.3] Password broker would always use notifications::email view.
 2016-06-30 09:11:50 -05:00
Taylor Otwell 9575714700 Add notifiable trait to default user. 2016-06-29 21:02:16 -05:00
Taylor Otwell 2051351626 Merge pull request #3822 from halaei/expire-90 
expire jobs after 90 seconds
 2016-06-29 08:39:32 -05:00
Taylor Otwell d6ca0a6dc6 Merge pull request #3819 from jrean/patch-1 
Added session domain env configuration
 2016-06-24 15:55:04 -05:00
Taylor Otwell 6e380aa8f2 Merge pull request #3820 from sbine/master 
Make password_resets.created_at nullable
 2016-06-24 10:33:14 -05:00
Taylor Otwell 737b5eb3ef stub notifications 2016-06-22 09:57:59 -05:00
Taylor Otwell b787586514 expects json 2016-06-22 08:48:58 -05:00
Taylor Otwell 51addd6c63 Merge pull request #3817 from JosephSilber/unauthenticated-json 
[5.3] Return JSON for unauthenticated AJAX requests
 2016-06-22 08:38:13 -05:00
Taylor Otwell bd358bdc0f Merge pull request #3815 from vlakoff/pdo-fetch-style 
[5.3] Use proper PDO fetch style
 2016-06-19 13:07:47 -04:00
Taylor Otwell 47d7e2d490 Merge pull request #3811 from jerguslejko/fix/supported-drivers-docs 
List supported drives in cache and broadcasting configs
 2016-06-14 20:20:03 -04:00
Taylor Otwell e5dfb05247 message updates 2016-06-06 21:43:34 -05:00
Taylor Otwell edc5cee942 Merge branch 'master' into develop 2016-06-04 09:37:46 -05:00
Taylor Otwell 767801a317 working on formatting 2016-06-04 09:37:32 -05:00
Taylor Otwell bee4dc1632 Merge pull request #3799 from drawmyattention/patch-1 
Make TestCase abstract
 2016-06-02 07:47:40 -05:00
Taylor Otwell f95f384ba3 Merge pull request #3791 from JosephSilber/authorize-namespace 
[5.3] Update `can` middleware to new namespace
 2016-05-29 21:39:25 -05:00
Taylor Otwell b4024058bb Merge pull request #3789 from luqmanrom/master 
Add missing Mandrill secret keys in config.services
 2016-05-29 15:03:07 -05:00
Taylor Otwell 19f8537829 fix namespace 2016-05-26 13:53:39 -05:00
Taylor Otwell 233c93f810 Merge pull request #3787 from JosephSilber/core-authenticate 
[5.3] Remove the Authenticate middleware
 2016-05-26 13:49:15 -05:00