phuongtc/minicrm
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,445 Commits 3 Branches 0 Tags
6c7a2fac175bcf4b3ae75ee95b8316db50e10976
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dayle Rees 6c7a2fac17 Adding EventSubscriber alias as per documentation. 2013-01-13 22:19:26 +00:00
Dayle Rees 0f690e83a0 Removing strange file additions. 2013-01-06 20:31:28 +00:00
Dayle Rees f0c3dbba40 Fixing merge issues. 2013-01-06 20:14:07 +00:00
Dayle Rees ca9c3b72b2 Merge pull request #1481 from maxdmyers/patch-1 
Dragons not present after warning
 2012-11-27 07:40:35 -08:00
Dayle Rees 6140089eb3 Merge pull request #1480 from flakerimi/develop 
Added Albanian Language
 2012-11-27 05:49:26 -08:00
Dayle Rees f7d82412fa Merge pull request #1451 from Chrty/master 
CSS resets for the profiler bar
 2012-11-27 05:46:25 -08:00
Dayle Rees 6ae889e5b8 Merge pull request #1472 from franzliedke/patch-61 
Fix pull request #1467
 2012-11-27 05:44:45 -08:00
Dayle Rees cac58db390 Merge pull request #1438 from dejangeci/fix/dns-speedup 
Changed DB config hosts to IP addresses
 2012-11-27 05:42:02 -08:00
Dayle Rees 49b2d4ab1a Merge pull request #1423 from laravie/feature/html-testcase 
Add unit testing coverage for Laravel\HTML
 2012-11-06 07:08:27 -08:00
Dayle Rees d20add8f75 Merge pull request #1422 from laravie/feature/form-testcase 
Add full code coverage for Laravel\Form
 2012-11-06 01:46:58 -08:00
Dayle Rees 5e3a8de1ba Merge pull request #1384 from machuga/patch-1 
Update LaravelRequest.php to alllow PUT/DELETE/PATCH on PHP5.4 built-in server
 2012-10-24 10:51:16 -07:00
Dayle Rees 0dc124d342 Merge pull request #1210 from franzliedke/patch-44 
Definition list support (#1202)
 2012-09-19 06:29:31 -07:00
Dayle Rees 99d710a820 Merge pull request #1242 from bstrahija/patch-1 
Trimming whitespace before doctype tag
 2012-09-19 06:21:32 -07:00
Dayle Rees b30ee488d0 Merge pull request #1225 from decola977/patch-2 
Update application/language/de/validation.php
 2012-09-17 01:52:43 -07:00
Dayle Rees 8fea602969 Merge pull request #1222 from dcelasun/patch-1 
Fix a tiny typo
 2012-09-14 03:30:10 -07:00
Dayle Rees 38562d5007 Merge pull request #1160 from kapv89/patch-2 
Updated Paginator to fit better with bootstrap 2.1
 2012-09-11 03:20:44 -07:00
Dayle Rees 705cd6a907 Merge pull request #1203 from xsbeats/bugfix/pluralizer_uncountable 
Added 'traffic' and 'chassis' as uncountable words to feed pluralizer
 2012-09-11 01:25:41 -07:00
Dayle Rees a5bb035e4c Merge pull request #1165 from JoostK/develop 
Problem with manual running of Artisan tasks
 2012-09-10 03:37:24 -07:00
Dayle Rees 666db87137 Merge pull request #1169 from mcintyre94/minor/add-touch-eloquent 
Added new touch function to eloquent, updates timestamps and immediately saves
 2012-09-10 03:30:32 -07:00
Dayle Rees f004ddcea7 Merge pull request #1189 from kapv89/patch-5 
Turn profiler off using runtime Config
 2012-09-10 03:23:36 -07:00
Dayle Rees a121e8f520 Merge pull request #1196 from freezestart/master 
Fixed readme.md wrong symbol
 2012-09-10 03:19:54 -07:00
Dayle Rees 2b1d8e6c83 Merge pull request #1179 from lollypopgr/ellang 
Changed the folder name from "gr" to "el"
 2012-09-04 11:02:28 -07:00
Dayle Rees ec13efb743 Merge pull request #1164 from lollypopgr/grlang 
Added Greek Language
 2012-09-03 04:08:22 -07:00
Dayle Rees 84bf7d662a Merge pull request #1128 from tobsn/patch-14 
added unsigned() description
 2012-08-21 06:54:33 -07:00
Dayle Rees 833cf12ce3 Merge pull request #1119 from thomiweb/master 
Danish translation of pagination and validation
 2012-08-21 02:41:50 -07:00
Dayle Rees f31c6dc313 Merge pull request #1127 from tobsn/patch-13 
Docu on how to ensure foreign() works
 2012-08-21 02:00:33 -07:00
Dayle Rees 7298c93be1 Merge pull request #1109 from JesseObrien/feature/profiler-timers 
Added profile timers
 2012-08-17 13:28:28 -07:00
Dayle Rees 722de55eeb Merge pull request #1105 from spencerdeinum/master 
Add Command::run() to artisan documentation.
 2012-08-16 14:29:30 -07:00
Dayle Rees 97761f08f1 missing a from attribute 2012-08-14 12:04:49 +02:00
Dayle Rees a7c2c2544e Merge pull request #1053 from tobsn/patch-12 
added array and array count validation for multi-select input
 2012-08-12 12:50:10 -07:00
Dayle Rees 4b8ba99211 Merge pull request #1043 from tobsn/patch-10 
type boolean is tinyint(1)
 2012-08-12 12:43:15 -07:00
Dayle Rees e0338f3671 Merge branch 'core-tests' of https://github.com/franzliedke/laravel into develop 2012-08-12 16:19:13 +01:00
Dayle Rees b5e81cb33c Merge pull request #1083 from spencerdeinum/master 
Input documentation fix.
 2012-08-09 13:23:33 -07:00
Dayle Rees 7256dc2a65 Merge pull request #1024 from Apathetic012/develop 
add output of File::mime() example
 2012-07-31 09:11:12 -07:00
Dayle Rees 06ac3274e5 Merge pull request #917 from HiroKws/japanese-language 
Japanese language
 2012-07-31 09:08:20 -07:00
Dayle Rees 0556ef35ce Merge branch 'develop' of github.com:laravel/laravel into develop 2012-07-31 16:55:50 +01:00
Dayle Rees 30175c2a52 fixing merge issues for comment tweaks 2012-07-31 16:55:02 +01:00
Dayle Rees dab2c79298 Merge pull request #933 from franzliedke/patch-22 
Request::time()
 2012-07-31 08:46:43 -07:00
Dayle Rees a0fd22f6f1 Merge pull request #772 from loic-sharma/patch-3 
Fixed bug where the profiler did not correctly put quotes around bindings
 2012-07-31 08:42:47 -07:00
Dayle Rees 01f8323420 Merge pull request #945 from cviebrock/html-link 
Allow second param of HTML::link* methods to be null
 2012-07-31 08:39:24 -07:00
Dayle Rees 2611c1f27a fixing merge issue for blade comments pull 2012-07-31 14:42:23 +01:00
Dayle Rees 9ea5018372 Merge branch 'develop' of github.com:laravel/laravel into develop 2012-07-31 14:37:07 +01:00
Dayle Rees 9d9d1d010c fixing merge for contribution docs 2012-07-31 14:36:44 +01:00
Dayle Rees 4b97c28c6b Merge pull request #860 from stevefrost/develop 
Updated the helper method dd()
 2012-07-31 06:33:27 -07:00
Dayle Rees 184cc090bc Merge pull request #1026 from jbruni/patch-1 
Update laravel/documentation/controllers.md
 2012-07-31 02:16:36 -07:00
Dayle Rees 3a471de777 franz routing docs fix 2012-07-31 10:06:10 +01:00
Dayle Rees 3d66011249 Merge pull request #1037 from tobsn/patch-9 
Returning results with SHOW queries
 2012-07-31 01:56:39 -07:00
Dayle Rees 37e5605c22 Merge pull request #1036 from tobsn/patch-8 
Added use Closure to database.php
 2012-07-31 01:55:02 -07:00
Dayle Rees 8c5ac60154 Merge pull request #935 from tobsn/patch-7 
Added explanation about PDO default attributes
 2012-07-31 01:53:41 -07:00
Dayle Rees 6d193c29e1 Merge pull request #1017 from Spir/develop 
Added french translation.
 2012-07-27 09:22:47 -07:00
Dayle Rees 2c6ed23b45 fixing merge issues 2012-07-27 13:52:15 +01:00
Dayle Rees da35e257fd Merge pull request #898 from franzliedke/patch-13 
[Profiler] Display page rendering time & memory usage
 2012-07-27 04:59:41 -07:00
Dayle Rees 0bc38ff2a8 Merge pull request #1009 from apit/lang-id 
Added Indonesian language files
 2012-07-27 04:57:11 -07:00
Dayle Rees 7b5e37a316 fixing merge issues on blade pull 2012-07-27 12:37:40 +01:00
Dayle Rees f969776312 Merge pull request #944 from dlabsnl/master 
Dutch language.
 2012-07-27 04:15:45 -07:00
Dayle Rees 483f5705a9 Merge pull request #990 from resurtm/html-indentation-fix 
Tiny indentation fix in html.php.
 2012-07-27 04:04:01 -07:00
Dayle Rees c27614b217 Merge pull request #996 from Jakobud/feature/pagination-docs 
Added documentation for paginate's second optional argument.
 2012-07-27 04:01:55 -07:00
Dayle Rees f7e7fa6299 Merge pull request #995 from cviebrock/eloquent-delete-doc 
Deleting Eloquent models
 2012-07-27 03:59:15 -07:00
Dayle Rees 3b09f99f9e Merge pull request #989 from dprvig/develop 
Fixed various typos throughout laravel folder.
 2012-07-27 03:54:40 -07:00
Dayle Rees 5299e32aee Merge pull request #1011 from Jakobud/feature/templating-docs 
Added documentation for the @render() Blade method
 2012-07-27 03:43:53 -07:00
Dayle Rees 1db67d47a3 Merge pull request #947 from franzliedke/patch-24 
Missing semicolon breaking test runner
 2012-07-23 08:21:07 -07:00
Dayle Rees 603e349de9 Merge pull request #878 from TommyC81/develop 
Documentation typo
 2012-06-29 10:38:02 -07:00
Dayle Rees 0ebeb14b67 Merge pull request #849 from franzliedke/patch-12 
Updates to the German translation
 2012-06-23 10:36:41 -07:00
Dayle Rees b8c4af1cd8 Merge pull request #852 from JeffreyWay/patch-1 
Fix small typo in validation docs.
 2012-06-23 10:35:26 -07:00
Dayle Rees 9296d08ec5 Merge pull request #825 from tobsn/patch-2 
German Translation
 2012-06-22 08:38:47 -07:00
Dayle Rees 6415f1d2ac Merge pull request #846 from tobsn/patch-6 
fixed link for query builder
 2012-06-22 08:35:27 -07:00
Dayle Rees 567b728666 Merge pull request #845 from tobsn/patch-5 
Environments Typo
 2012-06-22 08:34:05 -07:00
Dayle Rees 8d13bf9c5a removing unsigned from mysql grammer due to bug 
Signed-off-by: Dayle Rees <[email protected]>
 2012-06-22 16:25:50 +01:00
Dayle Rees e3317324b0 added clear() method to the input class 
Signed-off-by: Dayle Rees <[email protected]>
 2012-06-16 11:42:25 +01:00
Dayle Rees 5a1c1bf82c Merge pull request #801 from dlabs88/patch-1 
Typo in the docs Auth:usage
 2012-06-13 13:27:43 -07:00
Dayle Rees ffa9c7997a added ability to pass eloquent model to Auth::login() 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-26 13:19:12 +02:00
Dayle Rees 992a5f74ca fix for forelse only matching $vars 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-25 20:34:13 +01:00
Dayle Rees f58b9dea7f allow for overriding core tasks 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-25 19:05:34 +01:00
Dayle Rees 3f0adcb5f3 allow global messages format 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-25 18:47:17 +01:00
Dayle Rees 4abd56e695 added alias Authenticator for Laravel\Auth\Drivers\Driver 2012-05-24 15:34:34 +02:00
Dayle Rees cdcca78548 profiler upgrade additions 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-22 17:03:26 +01:00
Dayle Rees 70b64f1928 forgot to add blade::extend() to this 2012-05-14 14:11:56 +02:00
Dayle Rees b870807e1a renamed blade::register to blade::extend 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-04 19:02:44 +01:00
Dayle Rees d2de301ede added custom compilers to blade 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-04 18:44:43 +01:00
Dayle Rees d5c01b6e74 added ubuntu webfont and fixed taylors naughty naughty inline styles 
Signed-off-by: Dayle Rees <[email protected]>
 2012-05-04 17:42:06 +01:00
Dayle Rees e0251b7d57 restyled error pages to suit new views 2012-04-04 20:45:01 +01:00
Dayle Rees b5847c1f3a fixed logo bug 2012-04-04 20:14:20 +01:00
Dayle Rees 95b4b0924b added logo base64d to profiler 2012-04-04 20:05:38 +01:00
Dayle Rees ad57ae4fdf jquery loading and css fixes 2012-04-04 18:25:29 +01:00
Dayle Rees 27b0b321ac switched to markdown extra, with table styling 2012-04-03 19:59:54 +01:00
Dayle Rees edbac90ce3 added back to top widget 2012-04-03 11:30:00 +01:00
Dayle Rees 6f8e3259f0 added welcome view with link to docs 2012-04-03 09:46:09 +01:00
Dayle Rees 63a3e2b5ee better line-height on code samples 2012-04-03 09:08:39 +01:00
Dayle Rees a75c2bb1b3 assets moved toe public/laravel 2012-04-02 19:48:26 +01:00
Dayle Rees 8976493196 faded header, better lists 2012-04-02 19:35:39 +01:00
Dayle Rees 3cb1272028 fixed menu, added base styles, trying new header 2012-04-02 19:05:07 +01:00
Dayle Rees 2c459547e6 styling, prettyprint and layout 2012-04-02 10:03:02 +01:00
Dayle Rees bf32b6f6ca docs bundle in progress 2012-04-01 22:45:19 +01:00
Dayle Rees daea5fee2d changed anbu to load automatically at end of request- taylors idea 2012-03-29 21:18:06 +01:00
Dayle Rees 8d16ce8d81 adding the anbu alias 
Signed-off-by: Dayle Rees <[email protected]>
 2012-03-28 11:09:11 +01:00
Dayle Rees 66ff8a4076 integrated a simple version of anbu into the laravel core 
Signed-off-by: Dayle Rees <[email protected]>
 2012-03-28 10:30:51 +01:00
Dayle Rees 533112e2f5 added before and after date filters 
Signed-off-by: Dayle Rees <[email protected]>
 2012-03-21 21:07:10 +00:00
Dayle Rees 601b29a9d1 added bundle fetching notification for bundle:install 
Signed-off-by: Dayle Rees <[email protected]>
 2012-03-02 11:40:16 +00:00
Dayle Rees 2c4d35e6a4 allow File::cpdir() to fail (and return false) 2012-03-01 12:12:39 +00:00
Dayle Rees 29d062da75 better handling of undefined task methods 2012-02-13 15:07:52 +00:00