Prashant Singh
|
f3b532adef
|
WIP: CMS Pages fix in progress
|
2019-08-20 19:21:20 +05:30 |
Prashant Singh
|
3a9143462e
|
Added asterisk in description fields of catalog rule update and create
|
2019-08-20 17:27:49 +05:30 |
Prashant Singh
|
afafdfbfcd
|
Fixed issue #1327
|
2019-08-20 16:48:11 +05:30 |
Prashant Singh
|
2a15488f24
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-08-20 16:47:00 +05:30 |
Prashant Singh
|
9d5793b7b5
|
Fixed issue #1326
|
2019-08-20 16:25:00 +05:30 |
Prashant Singh
|
e52825a3f9
|
Fixed issue #1323
|
2019-08-20 16:10:24 +05:30 |
Prashant Singh
|
07be3c6a86
|
Fixed issue #1325
|
2019-08-20 16:07:41 +05:30 |
Prashant Singh
|
46e3badf4d
|
Fixed issue #1275, #1321, #1285
|
2019-08-20 15:56:32 +05:30 |
Prashant Singh
|
01b9f5cbbc
|
Fixed issue #1269
|
2019-08-20 13:33:24 +05:30 |
Prashant Singh
|
8cf6c41fc5
|
Fixed issue #1268
|
2019-08-20 13:31:59 +05:30 |
Jitendra Singh
|
fbf5da570e
|
Merge pull request #1318 from prashant-webkul/development
Development
|
2019-08-20 12:07:58 +05:30 |
Prashant Singh
|
0ea994502d
|
Fixed issues with Carbon instance and applied redirect to catalog rule index after applying rules
|
2019-08-20 11:46:20 +05:30 |
Prashant Singh
|
8744c84eb9
|
product card hover padding removed
|
2019-08-20 10:48:17 +05:30 |
Jitendra Singh
|
e5b904741c
|
Merge pull request #1316 from prashant-webkul/development
Catalog rule implementation complete, new product price mechanish rem…
|
2019-08-19 15:11:13 +05:30 |
Prashant Singh
|
e97069d2be
|
Catalog rule implementation complete, new product price mechanish remaining
|
2019-08-19 15:05:56 +05:30 |
Jitendra Singh
|
b7bc6344bb
|
Merge pull request #1313 from prashant-webkul/development
Development
|
2019-08-19 13:56:04 +05:30 |
Jitendra Singh
|
2ce5d52709
|
Merge pull request #1282 from KarimQaderi/patch-2
ViewRenderEventManager send string template
|
2019-08-19 13:55:00 +05:30 |
Prashant Singh
|
8a9198e5d9
|
Catalog rules tie break in progress, squased a line of dead code in CartRuleController
|
2019-08-19 12:36:43 +05:30 |
Prashant Singh
|
aca7b4c6c7
|
Catalog rule tie breaker content in progress
|
2019-08-17 20:18:39 +05:30 |
Prashant Singh
|
1d1018ac50
|
Refactoring of cart rules and syntax standard sugar
|
2019-08-17 17:40:17 +05:30 |
Jitendra Singh
|
a8ff894d6c
|
Merge pull request #1310 from prashant-webkul/development
Fixed channel locale issue in cms datagrid
|
2019-08-17 15:49:18 +05:30 |
Prashant Singh
|
bb972c6e48
|
CMS Bug fixes and updated readme
|
2019-08-17 15:42:24 +05:30 |
Prashant Singh
|
eb2f805057
|
Correct name of channel column in CMS page datagrid
|
2019-08-16 19:18:00 +05:30 |
Prashant Singh
|
b87e6cdb2e
|
Fixed channel locale issue in cms datagrid
|
2019-08-16 18:48:13 +05:30 |
Jitendra Singh
|
59cfd13795
|
Merge pull request #1307 from prashant-webkul/development
Development
|
2019-08-16 17:50:18 +05:30 |
Prashant Singh
|
beb579587c
|
Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development
|
2019-08-16 17:47:39 +05:30 |
Prashant Singh
|
bd6e0c9345
|
Structural changes in CMS pages. Fixed bugs #1300, #1295
|
2019-08-16 17:43:58 +05:30 |
Prashant Singh
|
39a07f0bd0
|
Structural changes in CMS pages
|
2019-08-16 17:36:47 +05:30 |
Jitendra Singh
|
f81d412546
|
Merge pull request #1298 from prashant-webkul/development
Development
|
2019-08-15 22:07:37 +05:30 |
Prashant Singh
|
8c96bca9b3
|
Base sync
|
2019-08-14 16:54:13 +05:30 |
Prashant Singh
|
44c33825e0
|
Cart discount helper namespace fix
|
2019-08-14 16:53:05 +05:30 |
Jitendra Singh
|
39a195f923
|
Merge pull request #1296 from prashant-webkul/development
Development
|
2019-08-14 14:55:44 +05:30 |
Prashant Singh
|
67ea34f05e
|
base sync
|
2019-08-14 14:03:21 +05:30 |
Prashant Singh
|
de24f9a39c
|
Fixed issue #1292 for CMS pages by making a separate view for helper classes and leaving future scope for things as well
|
2019-08-14 14:01:49 +05:30 |
Prashant Singh
|
da5ad23c3b
|
Fixed issue #1289
|
2019-08-14 13:50:32 +05:30 |
Prashant Singh
|
c56a791069
|
Fixed issue #1295
|
2019-08-14 13:49:42 +05:30 |
Prashant Singh
|
de1c00f15e
|
Fixed issue #1295
|
2019-08-14 13:49:04 +05:30 |
Prashant Singh
|
54e54918a7
|
Fixed issue #1293
|
2019-08-14 13:44:21 +05:30 |
Prashant Singh
|
9425b39b78
|
Fixed issue #1294
|
2019-08-14 13:42:27 +05:30 |
Jitendra Singh
|
ede01cb940
|
Merge pull request #1290 from rahulshukla-webkul/development
Development
|
2019-08-14 12:58:40 +05:30 |
rahul shukla
|
700c45df1a
|
conflict resolve
|
2019-08-14 12:25:40 +05:30 |
rahul shukla
|
436d71bb44
|
merge with master
|
2019-08-14 12:06:00 +05:30 |
rahul shukla
|
6609587387
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-08-14 12:03:52 +05:30 |
rahul shukla
|
909dbb51f0
|
condition changes for category filter
|
2019-08-14 12:02:30 +05:30 |
Prashant Singh
|
ce56fb3bb1
|
Added default attribute brand
|
2019-08-14 02:35:00 +05:30 |
Prashant Singh
|
dd9ff1629d
|
Fixed issue #1287
|
2019-08-13 23:31:14 +05:30 |
Jitendra Singh
|
6944128980
|
Merge pull request #1281 from KarimQaderi/patch-1
fix Event get params
|
2019-08-13 11:38:26 +05:30 |
Jitendra Singh
|
3d3d823372
|
Merge pull request #1274 from hChamran/hChamranpatch-1
Add fa lang
|
2019-08-13 11:35:12 +05:30 |
Hossein
|
d875855145
|
Update app.php
|
2019-08-13 10:33:30 +04:30 |
Karim Qaderi
|
781ed6e15e
|
change alignment of code
|
2019-08-13 10:08:07 +04:30 |