Commit Graph

83 Commits

Author SHA1 Message Date
Anand Doshi
aeed499d12 Merge branch 'master' into edge
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
2013-03-22 18:43:47 +05:30
Akhilesh Darjee
c3fde66f2c contact us page problem fixed. 2013-03-22 18:05:22 +05:30
Rushabh Mehta
3f725308e1 [website] [number_format] [fix] moved js function & added amount to order list 2013-03-22 14:56:31 +05:30
Rushabh Mehta
da512ba8c9 website: made order and ticket listing 2013-03-22 12:45:44 +05:30
Rushabh Mehta
4a80bc63b0 added permissions for server side print 2013-03-21 17:23:54 +05:30
Rushabh Mehta
bed19ac4d3 added website pages for orders, tickets and added sales invoice print format 2013-03-21 17:12:25 +05:30
Rushabh Mehta
a75efa76f9 added my account 2013-03-19 17:59:49 +05:30
Rushabh Mehta
1755b36ba3 fix to login 2013-03-19 14:35:20 +05:30
Rushabh Mehta
fd18fc7986 print format standard - start 2013-03-19 13:02:46 +05:30
Rushabh Mehta
43fbc9d1b9 added server side print format 2013-03-19 12:05:10 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Rushabh Mehta
5265f79e03 [website] product_page.html - fixed width 2013-03-18 10:31:18 +05:30
Rushabh Mehta
37db223329 make blog as raw content 2013-03-15 11:29:25 +05:30
Rushabh Mehta
cb6cf710bb website module: product page update 2013-03-14 16:45:28 +05:30
Rushabh Mehta
ebee1c7033 website module: minor updates 2013-03-14 14:33:31 +05:30
Rushabh Mehta
2eddd8ad68 removed december_2012.clear_web_cache patch 2013-03-12 21:39:56 +05:30
Rushabh Mehta
ae097f2209 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-03-12 21:38:38 +05:30
Anand Doshi
643236a1d9 fix in blog links 2013-03-12 20:26:33 +05:30
Anand Doshi
2e6806ee6a fixes in blog comments 2013-03-12 20:04:30 +05:30
Rushabh Mehta
84afb351d9 fix in about 2013-03-12 15:20:46 +05:30
Rushabh Mehta
6a4c468219 fix in about 2013-03-12 14:59:46 +05:30
Rushabh Mehta
11b1fb811f fixes to about us 2013-03-12 14:28:29 +05:30
Rushabh Mehta
0642083399 website: style fixes 2013-03-12 12:29:10 +05:30
Rushabh Mehta
1aff4c384d website added banner 2013-03-12 11:22:30 +05:30
Rushabh Mehta
758131b853 fixed slideshow 2013-03-12 11:07:45 +05:30
Rushabh Mehta
770e7938d9 added footer subscribe and blog settings 2013-03-11 18:30:05 +05:30
Rushabh Mehta
b33693db35 added blog settings and metadata 2013-03-11 17:57:57 +05:30
Rushabh Mehta
bbbceb617c website, blog: style fixes 2013-03-11 16:12:56 +05:30
Rushabh Mehta
981db7b561 Merge branch 'master' into edge 2013-03-08 11:09:48 +05:30
Rushabh Mehta
1dd330177d added writers page 2013-03-08 11:00:18 +05:30
Rushabh Mehta
a2deb68776 added blog category and other updates to website module 2013-03-08 10:44:25 +05:30
Rushabh Mehta
676a568f5a added blogger, updated style and blogs 2013-03-07 18:51:10 +05:30
Nabin Hait
c2429bb1dc Merge branch 'master' into edge 2013-03-06 14:35:27 +05:30
Rushabh Mehta
685be2fbea added validation for save conflict in single types too 2013-03-06 12:06:34 +05:30
Nabin Hait
cd629793cd Merge branch 'master' into edge 2013-03-06 11:34:48 +05:30
Rushabh Mehta
8ff938a377 backup manager (wip) 2013-03-06 11:20:56 +05:30
Anand Doshi
2beca173e0 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-22 12:01:16 +05:30
Rushabh Mehta
0ad995460c fixed tags in kb 2013-02-22 10:34:22 +05:30
Anand Doshi
fe78e912a2 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 20:07:53 +05:30
Anand Doshi
5acd08205e fix in website pages - should be of _type POST 2013-02-21 20:06:57 +05:30
Anand Doshi
c7cfe61229 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 16:59:41 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Rushabh Mehta
2be3a115c6 max height in product_in_list 2013-02-21 15:25:54 +05:30
Rushabh Mehta
fb3158571f max height in product_in_list 2013-02-21 15:23:36 +05:30
Rushabh Mehta
6f27d024aa added html5 header 2013-02-21 15:01:55 +05:30
Rushabh Mehta
d0db70507c added html5 header 2013-02-21 14:58:48 +05:30
Rushabh Mehta
90762fcb2d added html5 header 2013-02-21 14:56:44 +05:30
Rushabh Mehta
f210f1f359 added html5 header 2013-02-21 14:47:51 +05:30
Rushabh Mehta
78db3ec2dd added responsive layout with groups 2013-02-21 14:25:30 +05:30
Rushabh Mehta
1c36697556 updates to website footer 2013-02-21 10:54:04 +05:30