Ron Melkhior
6b73fae8d7
Add redirectTo attribute to the reset password controller
2016-10-16 03:44:24 +03:00
Taylor Otwell
472d6ae508
Merge pull request #4000 from zaknes/master
...
Add home link to welcome page
2016-10-14 21:12:18 -05:00
Zak Nesler
d0fa3fcba6
Added home link to welcome page
2016-10-14 17:27:22 -04:00
Taylor Otwell
38ba3280cc
Merge pull request #3996 from jehadassaf/patch-1
...
Ignore Passport-generated OAuth keys
2016-10-12 10:16:51 -05:00
Jehad Assaf
f7a79a33cf
Ignore Passport-generated OAuth keys
...
These files should not end up in source control IMO. And even though Passport is a separate package it is a first-party one and the base Laravel install should be "prepared" for it.
What do you guys think?
2016-10-12 15:51:50 +03:00
Taylor Otwell
5dc817bf55
Merge pull request #3994 from craigpaul/master
...
Updates laravel-elixir version for vue 2 compatibility
2016-10-11 13:59:34 -05:00
Craig Paul
d28866294b
Updates laravel-elixir version for vue 2 compatibility
2016-10-11 12:12:01 -06:00
Taylor Otwell
992aad03b0
Merge remote-tracking branch 'origin/master'
2016-10-10 07:56:51 -05:00
Taylor Otwell
ed9a82d6cc
fix comment
2016-10-10 07:56:44 -05:00
Taylor Otwell
a2df28face
Merge pull request #3988 from arcanedev-maroc/patch-1
...
Fixing typehint
2016-10-07 19:48:55 -05:00
ARCANEDEV
f699e710ad
Fixing typehint
2016-10-07 23:31:23 +01:00
Taylor Otwell
a37215d044
fix spacing
2016-10-07 16:39:42 -05:00
Taylor Otwell
421b210a77
Merge pull request #3987 from barryvdh/patch-2
...
Add typehint for Factory
2016-10-07 16:39:08 -05:00
Barry vd. Heuvel
93e078a79d
Add typehint for Factory
2016-10-07 15:08:41 +02:00
Erik Telford
e0573e67e0
Use mounted instead of ready
2016-10-02 21:33:52 -05:00
Erik Telford
6f9a450f5c
Bind to #app instead of body
2016-10-02 21:33:42 -05:00
Erik Telford
1117be09e7
Use vue 2 and elixir-vue-2
2016-10-02 21:33:25 -05:00
Taylor Otwell
f4606d2bb9
Merge pull request #3957 from WayneHarris/vue-resource
...
Update Vue Resource
2016-09-22 10:06:36 -05:00
Wayne Harris
76db1006cc
Update Vue Resource
...
Propose updating Vue Resource.
Will require changing the way the X-CSRF-TOKEN header in bootstrap.js
This seems to be compatible with Larval Passport
2016-09-22 10:36:43 +01:00
Taylor Otwell
4eeec60d7a
Merge remote-tracking branch 'origin/master'
2016-09-20 08:38:51 -05:00
Taylor Otwell
a80e5bca0b
add bus alias
2016-09-20 08:38:45 -05:00
Taylor Otwell
f777e894d9
Merge pull request #3951 from krienow/patch-d57d11
...
Add unique modifier
2016-09-20 08:28:29 -05:00
Kai Rienow
dcf971805d
Add unique modifier
2016-09-20 08:23:40 +02:00
Taylor Otwell
49a48100a7
different default name
2016-09-14 09:57:39 -05:00
Taylor Otwell
65e73f38cb
Merge branch 'develop'
2016-09-14 09:57:21 -05:00
Taylor Otwell
93d92bbb9e
Merge pull request #3942 from ramondj/patch-1
...
Rename variables.scss to _variables.scss
2016-09-14 08:15:03 -05:00
Ramon
d829d7553e
Rename variables.scss to _variables.scss
...
We don't need variables.scss to be compiled into CSS, because it's being imported into app.scss (and get's compiled there). Added an underscore so the Sass compiler ignores this file, which is a common practice with Sass partials (see http://sass-lang.com/guide @ Partials).
2016-09-14 11:19:50 +02:00
Taylor Otwell
31fce5c503
change wording
2016-09-06 20:49:16 -05:00
Francisco Daniel
30d0e2dcca
fix comments
2016-09-06 17:39:17 -05:00
Taylor Otwell
7f06559971
Merge pull request #3929 from bryceadams/patch-map-api-before-web
...
[5.3] Map API routes before Web routes
2016-09-05 09:41:38 -05:00
Bryce Adams
78f4e85f74
Map API routes before Web routes
2016-09-05 20:54:21 +10:00
Taylor Otwell
7da6edf8c1
working on message
2016-09-02 08:48:07 -05:00
Mohamed Said
1562407562
add langiage line for uploaded validation rule
2016-09-02 15:41:18 +02:00
Taylor Otwell
a4b53b394c
Merge pull request #3922 from jasonmccreary/https-only-cookie-env
...
Environment configuration for HTTPS only cookie
2016-09-02 07:53:55 -05:00
Taylor Otwell
a70dd5622b
Merge pull request #3923 from fernandobandeira/patch-1
...
Lang Alphabetical Order
2016-09-02 07:37:19 -05:00
Fernando Henrique Bandeira
dd1e64a7a4
Changing order
2016-09-02 08:39:34 -03:00
Jason McCreary
41b0560375
Environment configuration for HTTPS only cookie
2016-09-01 21:22:34 -04:00
Taylor Otwell
c92c724dbf
Merge pull request #3921 from jackmu95/add-mimetypes-translation
...
Add missing translation for `mimetypes` validation
2016-09-01 13:21:39 -05:00
Jacob Müller
537b6288fb
Add missing translation for mimetypes validation
2016-09-01 17:25:33 +02:00
Taylor Otwell
d09efa26d2
remove irrelevant comment
2016-09-01 09:01:57 -05:00
Taylor Otwell
07360db40a
Merge pull request #3913 from ngyikp/master
...
Add fallback sans-serif font in case the custom font fails to load
2016-08-28 18:11:47 +01:00
Taylor Otwell
d7fb66ca9b
Merge pull request #3914 from dersvenhesse/patch-1
...
Adding description for default inspire command
2016-08-28 18:08:19 +01:00
dersvenhesse
330a9aaa96
Adding description for default inspire command
2016-08-28 13:17:43 +02:00
Ng Yik Phang
8fc2e7e0a4
Add fallback sans-serif font in case the custom font fails to load
2016-08-28 13:53:23 +08:00
Taylor Otwell
1cb19ac911
Merge pull request #3910 from restored18/master
...
Add web.config for IIS
2016-08-26 22:20:33 +01:00
restored18
366f8ab23a
Add web.config
2016-08-26 14:33:46 -05:00
Taylor Otwell
63e0cdc493
Merge pull request #3909 from Rkallenkoot/patch-1
...
Sorted the Application Service Providers alphabetically
2016-08-26 12:39:50 +01:00
Roelof Kallenkoot
f19c16c023
Sorted the Application Service Providers alphabetically
...
Minor change to stay consistent
2016-08-26 00:16:58 +02:00
Taylor Otwell
de81dd38d1
Merge pull request #3906 from greabock/patch-1
...
Change .env PUSHER_* params order
2016-08-25 01:21:58 +02:00
Роман Сохарев
9c7fad23e7
Change .env PUSHER_* params order
...
jsut same order 
2016-08-25 05:57:45 +07:00
