Nabin Hait 46753de6d7 fixed merge conflict

2016-11-17 15:55:11 +05:30

..

announcement

Merge ERPNext Schools into ERPNext

2016-07-20 19:25:02 +05:30

assessment

Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch

2016-08-05 15:09:49 +05:30

cart

[fix] view shopping cart dropdown (#6928)

2016-11-14 13:13:53 +05:30

course

[fix] Issue #6046 group_name replaced with name

2016-08-10 11:06:31 +05:30

discussion

Merge ERPNext Schools into ERPNext

2016-07-20 19:25:02 +05:30

fee

Merge ERPNext Schools into ERPNext

2016-07-20 19:25:02 +05:30

footer

[enhancement] website: optionally show products as list

2016-04-22 19:10:49 +05:30

navbar

[fix] view shopping cart dropdown (#6928)

2016-11-14 13:13:53 +05:30

order

[Fix]Product thumbnail in Shopping Cart

2016-11-16 15:17:55 +05:30

projects

[WIP] Task statuses updated in website

2016-07-07 12:19:01 +05:30

rfq

[RFQ] Web form alignment issue

2016-09-01 19:10:58 +05:30

topic

Merge ERPNext Schools into ERPNext

2016-07-20 19:25:02 +05:30

__init__.py

Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext

2014-04-18 16:20:07 +05:30

address_row.html

[WIP] Address view fixed

2016-07-04 15:41:07 +05:30

cart.css

New look to the website

2016-05-02 11:43:44 +05:30

cart.js

Reverted changes

2016-06-28 15:02:35 +05:30

issue_row.html

[minor] fix ellipsis style

2016-11-02 07:34:17 +05:30

macros.html

[fix] view shopping cart dropdown (#6928)

2016-11-14 13:13:53 +05:30

product_list.js

[enhancement] website: optionally show products as list

2016-04-22 19:10:49 +05:30

product_page.js

[fixes] show link to visit cart after adding item, hide cart button on cart view

2016-01-12 14:09:52 +05:30

products_as_grid.html

[redesign] website routing system

2016-06-24 16:18:07 +05:30

products_as_list.html

[minor] fix ellipsis style

2016-11-02 07:34:17 +05:30

projects.css

[WIP] Task statuses updated in website

2016-07-07 12:19:01 +05:30

rfq.js

[Enhancement] Added supplier quotation link on rfq

2016-10-05 15:04:50 +05:30

transaction_row.html

[minor] fix ellipsis style

2016-11-02 07:34:17 +05:30