phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,746 Commits 3 Branches 0 Tags
65842ae55a5795fe5d6546474107326cfa3f7d6c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Otwell 65842ae55a Merge pull request #2377 from rmobis/master 
Tiny inconsistency between 'between' and 'digits_between' validation rules messages
 2013-10-29 13:35:12 -07:00
Taylor Otwell b2ac3197be Merge pull request #2311 from msurguy/patch-2 
The default message was not clear
 2013-10-22 20:03:48 -07:00
Taylor Otwell 6a352640c5 Merge pull request #2321 from ameech/patch-1 
Updated line to use spaces instead of tabs.
 2013-10-22 18:07:44 -07:00
Taylor Otwell 1745513035 Merge pull request #2358 from JosephSilber/ignore-windows-thumbs 
gitignore windows thumbnails
 2013-10-13 18:57:04 -07:00
Taylor Otwell aced8afaab Add missing comma. 2013-10-11 22:34:42 -05:00
Taylor Otwell d1c04014dd Merge pull request #2332 from laheab/master 
Move pre-update-cmd to post-update-cmd, solves inconveniences.
 2013-10-11 20:33:50 -07:00
Taylor Otwell fbd93f6997 added note about expiry time on reminders. 2013-09-06 23:42:43 -05:00
Taylor Otwell 91ca1707b8 Merge pull request #2278 from fabpot/patch-1 
Add missing license information in composer.json
 2013-08-29 01:36:11 -07:00
Taylor Otwell 5c49245afe Merge pull request #2237 from mmeyer2k/patch-2 
Update comment for clarity
 2013-08-15 06:40:32 -07:00
Taylor Otwell 6a2ad475cf Added array validation language lines. 2013-07-30 09:05:55 -05:00
Taylor Otwell 93aee27cd9 Add expire option to reminder config. 2013-07-29 16:22:51 -05:00
Taylor Otwell 08cb97fa6d Tweak .htaccess. 2013-06-15 13:15:13 -05:00
Taylor Otwell 19841d865d Merge pull request #2095 from briankiewel/patch2 
changed google font url to be protocol relative
 2013-06-10 05:57:53 -07:00
Taylor Otwell f583a9d23f Added post create-project command to generate key. 2013-06-09 20:24:38 -05:00
Taylor Otwell b7c147c77a Update encrypter comment. 2013-06-09 20:22:11 -05:00
Taylor Otwell fe74ce3da1 Merge pull request #2089 from briankiewel/patch1 
changed spaces to tabs
 2013-06-09 18:17:04 -07:00
Taylor Otwell 51a013fbbf Fix closing div tag. 2013-06-09 20:07:34 -05:00
Taylor Otwell e526c08800 Added "pretend" option to mail config. 2013-06-08 13:14:14 -05:00
Taylor Otwell 71a5ad6282 Update readme.md 2013-06-07 08:59:40 -05:00
Taylor Otwell 1c0920080e Update readme.md 2013-06-07 08:58:40 -05:00
Taylor Otwell 9b44c33cb3 Fix package name. 2013-05-31 08:30:40 -05:00
Taylor Otwell d1520dc1b9 Adding a few things to the composer.json file. 2013-05-31 08:29:03 -05:00
Taylor Otwell 6d4418afff Merge pull request #2044 from jonathanmarvens/master 
Tiny grammar fix...[:)].
 2013-05-30 05:56:41 -07:00
Taylor Otwell c0a26f50ac Fix unit test example. 2013-05-29 08:59:05 -05:00
Taylor Otwell b87a78fb17 Tweak welcome page. 2013-05-28 11:28:05 -05:00
Taylor Otwell 075e5e93f0 Merge branch 'master' into develop 2013-05-28 10:50:51 -05:00
Taylor Otwell e510b02812 Tweak framework readme. 2013-05-28 09:37:32 -05:00
Taylor Otwell b9fe2dda26 Merge pull request #2013 from juukie14/master 
Conditionally Loading jQuery in profiler template
 2013-05-28 06:08:00 -07:00
Taylor Otwell c89354f63c Merge pull request #2026 from vus520/3018bcce718665e28b6fcf8b48fc3ef79f9d8c65 
add Simplified Chinese language package
 2013-05-28 06:04:39 -07:00
Taylor Otwell 443fc9d7b5 Merge pull request #2027 from nils-werner/executable 
Make artisan executable
 2013-05-28 06:04:22 -07:00
Taylor Otwell c7caca41a2 Merge pull request #2022 from kirkbushell/master 
Route update to call aliased Controller class
 2013-05-27 18:08:11 -07:00
Taylor Otwell 2e65a168dc Merge pull request #2021 from ipalaus/fix/sendmail-config 
The default sendmail path must contain '-bs' or '-t' flags.
 2013-05-27 04:13:03 -07:00
Taylor Otwell 15bd1bfa63 Fix casing. 2013-05-26 13:50:33 -05:00
Taylor Otwell af39f0c2b1 Just boot MbString on Patchwork. 2013-05-26 13:50:16 -05:00
Taylor Otwell ad52c50f87 Merge pull request #2018 from laravel/welcome-page 
New welcome page.
 2013-05-25 11:47:59 -07:00
Taylor Otwell 96a3027b31 Updated available drivers for mail. 2013-05-24 09:25:36 -05:00
Taylor Otwell 79e3aab4a6 Added sendmail path config option. 2013-05-24 09:24:49 -05:00
Taylor Otwell 58d6b112a7 Merge pull request #2009 from dr-dimitru/master 
Validation Russian language update
 2013-05-21 18:05:38 -07:00
Taylor Otwell 71cb787346 Merge pull request #1999 from ipalaus/fix/session-payload 
Removed the unused setting 'session.payload'.
 2013-05-20 12:36:17 -07:00
Taylor Otwell 6a1d203baf Merge pull request #1994 from aeberhardo/bug/putenv 
Fixes variable export for Windows.
 2013-05-15 12:52:16 -07:00
Taylor Otwell 37acc995df Merge pull request #1991 from juukie14/master 
Validation language line correction
 2013-05-15 12:51:33 -07:00
Taylor Otwell fe00e01212 Merge pull request #1992 from neoascetic/patch-1 
Fix russian translation for 'exists' validation rule
 2013-05-15 12:51:16 -07:00
Taylor Otwell 678b92ef85 putenv in test runner. 2013-05-14 01:15:51 -05:00
Taylor Otwell 9871281b34 Merge pull request #1880 from authman/master 
Patch for ->push();
 2013-05-13 23:12:08 -07:00
Taylor Otwell d1ae2324fd Fix returning check for Postgres. 2013-05-14 00:55:26 -05:00
Taylor Otwell c878a18fdb Merge pull request #1962 from fpirsch/master 
fix incorrect padding with multibyte strings encryption
 2013-05-13 22:53:15 -07:00
Taylor Otwell 5d63d5ad52 Consider protocoless URLs as valid. Closes. #1966. 2013-05-14 00:51:08 -05:00
Taylor Otwell 1fdd186dde Merge pull request #1974 from neoascetic/belongs_to_call_a_getter 
Access foreign property in Belongs_To through a getter
 2013-05-13 22:49:36 -07:00
Taylor Otwell 3965429176 Merge pull request #1970 from jasonlfunk/master 
Allow developers to set the Content-Disposition header in Response::download()
 2013-05-13 22:47:15 -07:00
Taylor Otwell 86fc0ca7cb Merge pull request #1976 from neoascetic/more_fluent_eloquent 
Even more fluent eloquent model via magic setters
 2013-05-13 22:43:15 -07:00
Taylor Otwell 727b69494b Check arrays on Input::had. Closes #1988. 2013-05-14 00:41:42 -05:00
Taylor Otwell 8709c6c6b0 Use app_path in global file. Closes #1975. 2013-05-14 00:40:22 -05:00
Taylor Otwell 6891fb7b21 Merge pull request #1963 from EvgenyKovalev/master 
Language fix for Validation.
 2013-05-13 22:35:07 -07:00
Taylor Otwell 7fb445b107 Merge pull request #1987 from netflam/patch-1 
Update .htaccess
 2013-05-13 22:32:14 -07:00
Taylor Otwell 348feccd3e Merge pull request #1989 from juukie14/master 
Added Dutch translation for validation rules "date_format" and "required_with".
 2013-05-13 22:32:01 -07:00
Taylor Otwell c7f889fe54 Move slash redirects to application level. 2013-05-14 00:27:41 -05:00
Taylor Otwell 086f2966c0 Merge pull request #1973 from bencorlett/patch-3 
Updates for the rename of the `HTML` facade.
 2013-05-11 18:03:43 -07:00
Taylor Otwell 24f0d9a5b8 Update HTML alias. Closes #1210. 2013-05-07 08:19:08 -05:00
Taylor Otwell db365ddaae Remove pre-install cmd for now. 2013-05-06 09:35:34 -05:00
Taylor Otwell e12830534e Tweak composer commands. Closes #1954. 2013-05-04 19:29:52 -05:00
Taylor Otwell cffded660c Merge pull request #1959 from dotramses/patch-1 
Update migrator.php
 2013-05-04 17:26:19 -07:00
Taylor Otwell 3d533f03e6 Fix method override. 2013-05-04 19:25:53 -05:00
Taylor Otwell 07a5edb9db Fix comment. Closes #1958. 2013-05-04 14:30:52 -05:00
Taylor Otwell e8823e798b Added clear compile pre update script. 2013-05-03 22:26:37 -05:00
Taylor Otwell 1e68129265 Tweak maintenace mode handler. 2013-05-02 15:33:15 -05:00
Taylor Otwell 74cd3eb838 Added proper code for new maintenance mode feature. 2013-05-02 15:31:21 -05:00
Taylor Otwell e72b120929 Fix spelling. 2013-05-01 14:27:12 -05:00
Taylor Otwell b9cf8dfb71 Upgrade to latest Symfony HttpFoundation tag. Closes #1865. 2013-05-01 14:19:14 -05:00
Taylor Otwell c25c56ecfd Merge pull request #1876 from briankiewel/robots 
Changed robots.txt to use disallow instead of allow
 2013-05-01 12:09:09 -07:00
Taylor Otwell 9ee8da7bfd Fix session configs. Closes #1943. 2013-05-01 14:06:27 -05:00
Taylor Otwell d8abb9d603 Merge pull request #1877 from briankiewel/htaccess-tabs 
Converted spaces to tabs in .htaccess for consistency
 2013-05-01 09:43:19 -07:00
Taylor Otwell 5c340a60a9 Merge pull request #1879 from jasonlewis/fix/use-base-path-in-start 
Use the base.path when loading the illuminate application.
 2013-05-01 09:42:58 -07:00
Taylor Otwell 92f602edbf Merge pull request #1875 from effenberger/master 
modified IoC::registred()
 2013-05-01 09:41:58 -07:00
Taylor Otwell 048e3322d5 Merge pull request #1931 from vlakoff/develop 
Fix comment on default session driver.
 2013-05-01 09:24:23 -07:00
Taylor Otwell c991a4cfb1 Fix typo. Closes #1935. 2013-05-01 11:18:09 -05:00
Taylor Otwell d433293e8a Add required_if validation language line. 2013-04-30 09:57:09 -05:00
Taylor Otwell 763f1d5181 Use Redirect::guest in "auth" filter. 2013-04-23 22:27:51 -05:00
Taylor Otwell b042d46bfe Set preferred install as "dist" out of the box. 2013-04-19 23:39:29 -05:00
Taylor Otwell b16bb1ac6a Setup Patchwork for 1.1.*. 2013-04-18 11:00:40 -05:00
Taylor Otwell 5b43ff5181 Added "cookie" back in as session option. 2013-04-17 16:28:05 -05:00
Taylor Otwell 452956551b Fix comments on session. 2013-04-17 00:29:48 -05:00
Taylor Otwell d9c559ba7f Tweak for session changes. 2013-04-16 22:36:51 -05:00
Taylor Otwell 997f789c47 Move comment to line it up with others. 2013-04-15 15:32:11 -05:00
Taylor Otwell e0d6b130b8 Remove pre-update script. 2013-04-14 13:54:33 -05:00
Taylor Otwell 315bb1dd9b Add pre-update command to remove the compiled file. 2013-04-14 13:51:53 -05:00
Taylor Otwell 6e5ca7331e Add "url" option to configuration. 2013-04-13 08:30:14 -05:00
Taylor Otwell 503ba02411 Merge pull request #1864 from bencorlett/develop 
Lining up translation.
 2013-04-10 20:12:31 -07:00
Taylor Otwell 23464cac25 Merge pull request #1868 from aeberhardo/bug/version-bump-3.2.14 
Incremented version from 3.2.13 to 3.2.14
 2013-04-10 20:11:34 -07:00
Taylor Otwell 64953eb196 Merge pull request #1869 from aeberhardo/docs/contributing-typo 
Fixed a typo in "Contributing" chapter
 2013-04-10 20:11:15 -07:00
Taylor Otwell 343c31e5db Redirect trailing slashes with 301. 2013-04-09 15:37:50 -05:00
Taylor Otwell b2a1c9be53 Turn on Redis clustering by default. 2013-04-08 19:48:02 -05:00
Taylor Otwell c9d0090f72 Fix typo. 2013-04-08 11:16:11 -05:00
Taylor Otwell 3b601fee4a Added auth.basic filter. 2013-04-08 10:39:36 -05:00
Taylor Otwell 936160f907 Merge pull request #1850 from rk/patch-1 
Check application.ssl when setting a secure cookie
 2013-04-06 18:27:53 -07:00
Taylor Otwell 9c9b6eed10 Merge remote-tracking branch 'origin/master' 2013-04-06 20:27:07 -05:00
Taylor Otwell 5ddeab6051 pass exception to 500 event correctly. 2013-04-06 20:27:00 -05:00
Taylor Otwell 0008a2324f Merge pull request #1857 from doubleking/master 
Changed Laravel\ namespace prefix in some classes calls in helpers to global.
 2013-04-05 06:49:55 -07:00
Taylor Otwell 4ecbef68a0 Merge pull request #1853 from cviebrock/table-macros 
Add Macros to tables
 2013-04-04 10:41:39 -07:00
Taylor Otwell 78af4569de Merge pull request #1855 from rittme/patch-1 
get_dirty() comparison is not type safe
 2013-04-04 10:40:18 -07:00
Taylor Otwell d8daedcb46 Merge pull request #1852 from andershammar/develop 
Add validation error message for the 'required_without' rule
 2013-04-04 08:10:32 -07:00