Commit Graph

8435 Commits

Author SHA1 Message Date
devansh bawari 2a91392780 Filtered Config Files 2021-05-19 14:58:53 +05:30
Glenn Hermans a20e0651cc
Merge pull request #4879 from boombertz/admin-ptBR
Update Admin translations in pt_BR
2021-05-19 00:19:01 +02:00
Bertz 9f7ac512f3 Update Admin translations in pt_BR 2021-05-18 15:01:46 -03:00
Glenn Hermans 2aadfcc98d
Merge pull request #4876 from devansh-webkul/default-address
Implemented default address for customers #4875
2021-05-18 19:45:04 +02:00
Glenn Hermans 94c638d8cb
Merge pull request #4877 from devansh-webkul/exchange-rate-api
Exchange Rates Key Added #4869
2021-05-18 19:43:50 +02:00
devansh bawari b5a9ae05c8 Exchange Rate Key Added 2021-05-18 17:58:24 +05:30
devansh bawari e162e744f1 Merge remote-tracking branch 'upstream/master' into default-address 2021-05-18 14:41:02 +05:30
Glenn Hermans 90c52be42f
Merge pull request #4874 from devansh-webkul/exchange-rate
Capitalized Fixer API Key For Consistency In `.env.example` File
2021-05-18 11:07:17 +02:00
devansh bawari ec9214c2bb Implemented In Default Theme 2021-05-18 14:34:16 +05:30
Glenn Hermans 86ab6d39ff
Merge pull request #4872 from devansh-webkul/depedency-update
Fixed getting exception when click on print invoice #4865
2021-05-18 10:58:31 +02:00
devansh bawari 52a6fbabda Velocity Theme Implemented 2021-05-18 14:24:35 +05:30
devansh bawari 0e14f9fdc2 Translation Added 2021-05-18 14:16:28 +05:30
devansh bawari c915df1761 Capitalized .env Key 2021-05-18 10:51:24 +05:30
Jitendra Singh 20708f60c5
Merge pull request #4859 from KarimQaderi/fix-lang-fa
fix lang fa
2021-05-18 09:57:40 +05:30
Devansh e3817973e7 Dev Branch Added To Tymon Auth 2021-05-18 04:21:08 +00:00
devansh bawari 46d2484b70 Version Updated 2021-05-17 18:23:50 +05:30
devansh bawari f2617a7013 Dependency Updated 2021-05-17 17:57:49 +05:30
Glenn Hermans 3c2a91191b
Merge pull request #4862 from KarimQaderi/add-title-to-data-grid-actions-2
add title to data grid actions
2021-05-11 06:09:46 +02:00
KarimQaderi cca41bce72 add title to data grid actions 2021-05-10 22:50:06 +04:30
Glenn Hermans 6a3e5c539f
Merge pull request #4860 from KarimQaderi/fix-action-datagrid-plus-for-persian-or-arabic
Fix bug action datagrid plus for persian or arabic
2021-05-10 11:57:43 +02:00
KarimQaderi 724711f51b Fix action datagrid plus for persian or arabic 2021-05-10 13:26:22 +04:30
KarimQaderi a0e50eed50 fix lang fa 2021-05-10 11:07:53 +04:30
Glenn Hermans dc2cc7a3c7
Merge pull request #4852 from rahulcs0082/4847
Issue #4847 fixed
2021-05-06 19:11:35 +02:00
Glenn Hermans 569b40e834
Merge pull request #4849 from shubhwebkul/master
resolved #4848
2021-05-06 12:46:26 +02:00
rahulcs0082 158a4b9d87 Issue #4847 fixed 2021-05-06 10:57:02 +05:30
Glenn Hermans 5f39280d18
Merge pull request #4850 from bagisto-europe/mail-settings
Moved mail settings to correct section
2021-05-06 02:10:30 +02:00
Glenn Hermans 1108e8114b email update 2021-05-05 23:15:56 +02:00
Glenn Hermans 01dc23d705
Moved email settings from general to email 2021-05-05 19:30:53 +02:00
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
Shubham Mehrotra 0a2163f66b resolved #4848 2021-05-05 18:00:22 +05:30
Shubham Mehrotra b439a58891 Merge branch 'master' of https://github.com/bagisto/bagisto 2021-05-05 17:42:05 +05:30
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
Shubham Mehrotra f25c4a7153 Merge branch 'master' of https://github.com/bagisto/bagisto 2021-05-04 13:05:59 +05:30
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