Commit Graph

8394 Commits

Author SHA1 Message Date
Glenn Hermans eaf9b367c1
Moved email settings in admin panel
Moved email settings from General to Email
2021-05-05 19:25:26 +02:00
Glenn Hermans fe1ee2dcad
Updated notifications translations 2021-05-05 18:31:17 +02:00
Glenn Hermans 0de4819a74
Merge pull request #24 from bagisto/master
Update fork
2021-05-05 18:27:16 +02:00
Glenn Hermans d69e5a41b0
Merge pull request #4846 from bagisto-europe/labels
admin form label support
2021-05-05 06:12:46 +02:00
Glenn Hermans 8a53abb354
Make labels clickable 2021-05-05 06:01:59 +02:00
Glenn Hermans ad092a0163
Merge pull request #23 from bagisto/master
Update branch
2021-05-05 01:56:19 +02:00
Glenn Hermans 76fa152ba1
Merge pull request #22 from bagisto/master 2021-05-05 01:54:08 +02:00
Glenn Hermans a1ef8e8904
Merge pull request #4845 from devansh-webkul/master
Latest Recompiled UI Package File
2021-05-04 06:16:08 +02:00
devansh bawari e69bbe8cbc Recompiled 2021-05-04 09:33:48 +05:30
Glenn Hermans d7c0e1f66e
Merge pull request #4844 from bagisto-europe/3251
fixed #3251
2021-05-04 05:57:10 +02:00
Glenn Hermans 794c166082 Added invoice states 2021-05-04 05:22:33 +02:00
Glenn Hermans 3a307a8371 fix #3251 2021-05-04 05:00:36 +02:00
Glenn Hermans 777ebd31cc
Merge pull request #21 from bagisto/master
Update fork
2021-05-04 02:03:22 +02:00
Glenn Hermans 446c4384fe
Merge pull request #4841 from rahulcs0082/4840
Issue #4840 fixed
2021-05-03 15:24:06 +02:00
Glenn Hermans 3606c8ce1e
Merge pull request #4839 from rahulcs0082/4557
Issue #4557 done
2021-05-03 13:24:42 +02:00
rahulcs0082 00f8497d2f Issue #4840 fixed 2021-05-03 16:49:18 +05:30
rahulcs0082 ee98ba8525 fixes as per comment 2021-05-03 14:27:08 +05:30
rahulcs0082 aa88f1390d Issue #4557 done 2021-05-03 11:36:17 +05:30
Glenn Hermans 60b40fc478
Merge pull request #4837 from bagisto-europe/shipping
Define a custom order status for shipments
2021-05-03 04:15:57 +02:00
Glenn Hermans 899d70483d
Added missing space 2021-05-03 03:22:24 +02:00
Glenn Hermans b2fda6bea9
fixed order 2021-05-03 03:12:41 +02:00
Glenn Hermans e6c23a9810
Added missing params 2021-05-03 02:07:34 +02:00
Glenn Hermans 06803fa866
Updated php doc 2021-05-03 02:05:40 +02:00
Glenn Hermans 0f4da65937
Define custom order state on shipments 2021-05-03 02:03:28 +02:00
Glenn Hermans 5e48a85d9f
Merge pull request #19 from bagisto/master
Update fork
2021-05-03 02:00:49 +02:00
Glenn Hermans fb48f61497
Merge pull request #4836 from bagisto-europe/update_invoice_state
Define a custom invoice state
2021-05-02 20:17:27 +02:00
Glenn Hermans dbf8b9f384
added space 2021-05-02 20:01:27 +02:00
Glenn Hermans 9e2e54af5c
Merge pull request #4835 from bagisto-europe/update_order
Define a custom order status
2021-05-02 19:52:32 +02:00
Glenn Hermans 761263c0e7
Merge pull request #18 from bagisto-europe/update_order
fixed spacing
2021-05-02 19:52:17 +02:00
Glenn Hermans db505d5551
fixed spacing 2021-05-02 19:39:03 +02:00
Glenn Hermans 04aac03bbd
fixed #3453 2021-05-02 19:29:52 +02:00
Glenn Hermans 52206b582f
Added optional custom order status 2021-05-02 19:18:30 +02:00
Glenn Hermans 2238c660c9
Merge pull request #17 from bagisto/master 2021-05-02 19:15:16 +02:00
Glenn Hermans 0e236dddb0
Merge pull request #4833 from bagisto/dependabot/composer/laravel/framework-8.40.0
Bump laravel/framework from 8.35.1 to 8.40.0
2021-04-30 13:21:41 +02:00
Glenn Hermans a1e569c321
Merge pull request #4826 from devansh-webkul/ui-accordion-component-enhancement
Updated Accordion Component #4814
2021-04-30 11:14:53 +02:00
devansh bawari 59e08d26d9 Recompiled 2021-04-30 09:37:51 +05:30
devansh bawari 2b80b67283 Merged With Master 2021-04-30 09:36:11 +05:30
dependabot[bot] 09ea192f3a
Bump laravel/framework from 8.35.1 to 8.40.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.35.1 to 8.40.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-8.x.md)
- [Commits](https://github.com/laravel/framework/compare/v8.35.1...v8.40.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 23:48:09 +00:00
Glenn Hermans 1027ffce68
Merge pull request #4824 from devansh-webkul/ui-date-component-enhancement
Date And Datetime Component Enhanced #4816
2021-04-29 18:57:24 +02:00
Glenn Hermans d8500435c8
Merge pull request #4832 from devansh-webkul/issues-4831
Fixed header content category which is not clickable on velocity #4831
2021-04-29 18:56:13 +02:00
devansh bawari c2cbca7146 Some Class Added To Select Box 2021-04-29 19:53:05 +05:30
devansh bawari fef39563ef Merge branch 'master' into ui-date-component-enhancement 2021-04-28 10:16:14 +05:30
devansh bawari 946bd501ae Recompiled 2021-04-28 10:12:32 +05:30
devansh bawari 26993d2a16 Merged With Master 2021-04-28 10:10:52 +05:30
Glenn Hermans 825b88627d
Merge pull request #4829 from rahulcs0082/3251
Issue #3251 done
2021-04-27 16:49:25 +02:00
Glenn Hermans 24466859f3
Merge pull request #4828 from devansh-webkul/sidebar-issue
Fixed shop by category which dissapears on hover #4827
2021-04-27 15:59:27 +02:00
rahulcs0082 3e3af212f4 conflict resolve 2021-04-27 19:24:04 +05:30
rahulcs0082 8732e8d8e4 Issue #3251 done 2021-04-27 19:09:53 +05:30
devansh bawari 4efb1676e0 Mouse Out Handled 2021-04-27 19:04:37 +05:30
devansh bawari a573fa380c Recompiled 2021-04-27 17:57:44 +05:30