Commit Graph

278 Commits

Author SHA1 Message Date
Anand Doshi
6241012f08 [website] [slideshow] clear website cache on update of a slide show 2013-05-22 12:37:50 +05:30
Anand Doshi
dcfb4b7ab9 [website] [fix] explicitly pass meta description 2013-05-22 12:14:31 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Anand Doshi
220ff30878 [website] [product] show currency symbol and show specifications below the image 2013-05-14 15:33:34 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Nabin Hait
c4b0e19b47 [fixes] about us settings 2013-05-03 11:02:13 +05:30
Anand Doshi
07f6958c1f [login] [disable signup] option to disable signup link in login page 2013-05-02 15:51:45 +05:30
Rushabh Mehta
3ddc524361 [form] [comments] fixed 2013-04-30 16:50:48 +05:30
Rushabh Mehta
333d438c32 [merge] 2013-04-24 10:08:39 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
651ce05fcc [merge master
]
2013-04-18 10:37:16 +05:30
Anand Doshi
311a243bdc Merge branch 'master' into edge
Conflicts:
	website/doctype/website_settings/website_settings.txt
2013-04-17 15:50:20 +05:30
Anand Doshi
58b8d6fdf3 [website settings] [cleanup] removed mandatory check on Home Page 2013-04-17 15:22:06 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Anand Doshi
09480e2241 [sitemap] [fixes] 2013-04-16 20:57:09 +05:30
Rushabh Mehta
5ed6676193 [editor] [stylefix] 2013-04-15 10:49:17 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Rushabh Mehta
3023a8fa9b [website] [cleanup] separated website generation in framework and erpnext 2013-04-03 16:34:23 +05:30
Rushabh Mehta
9db1a68d89 [website] [cleanup] moved website generic utils to framework 2013-04-02 10:41:37 +05:30
Rushabh Mehta
9f43fc50ad [website] [product list] image clickable 2013-04-01 12:12:47 +05:30
Rushabh Mehta
fe7a53bca3 [data-import] [fix] changed template to remove -- separators that get removed for some reason 2013-03-30 11:56:13 +05:30
Rushabh Mehta
7ab3267886 updated item group limit to 100 2013-03-28 17:09:23 +05:30
Rushabh Mehta
2fe802c81e [website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..) 2013-03-28 16:26:11 +05:30
Rushabh Mehta
c75eaa2e3c [print] [fix] added utf-8 metatag 2013-03-26 15:56:47 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
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
30be03673e [website] [fix] no cache for order, ticket 2013-03-22 13:51:41 +05:30
Rushabh Mehta
a0fa3300b7 [website] [fix] signup permissions 2013-03-22 13:02:08 +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
c08e1037d6 blog_feed 2013-03-15 11:36:43 +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
e9bef3cbf0 website module: minor updates 2013-03-14 15:39:43 +05:30
Rushabh Mehta
1ffaaf4110 website module: minor updates 2013-03-14 15:36:43 +05:30
Rushabh Mehta
93da8a1b0e website module: minor updates 2013-03-14 15:32:49 +05:30
Rushabh Mehta
1aab4eaf8d website module: minor updates 2013-03-14 15:06:44 +05:30
Rushabh Mehta
ebee1c7033 website module: minor updates 2013-03-14 14:33:31 +05:30
Rushabh Mehta
5128b664a7 website: added no_cache to message page 2013-03-13 16:36:33 +05:30
Rushabh Mehta
a1041d5128 website: don't waste db connection if loading page from cache 2013-03-13 16:34:43 +05:30
Rushabh Mehta
d84f299c40 website_settings: added button to generate html banner 2013-03-13 16:30:10 +05:30
Rushabh Mehta
05b23c7a45 website style fixes 2013-03-13 14:50:38 +05:30
Rushabh Mehta
860f3ceada added shades to website style 2013-03-13 12:50:08 +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
Anand Doshi
e5c395f8b6 fix in style settings color validation 2013-03-12 18:20:06 +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
c9977ae7d9 added text coloring options for website 2013-03-12 11:48:23 +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
b7ce8aa20b make blog post importable 2013-03-11 15:23:36 +05:30
Rushabh Mehta
b7713b943b website home link fix 2013-03-11 15:20:06 +05:30
Rushabh Mehta
b8ec3e7ecb renamed blog to blog_post and refresh issues 2013-03-11 14:29:09 +05:30
Rushabh Mehta
6316e872cd website: fixes to collapsible menu 2013-03-11 13:53:56 +05:30
Rushabh Mehta
f19dcb8492 website fixes 2013-03-08 13:17:31 +05:30
Rushabh Mehta
28b750d2ce website fixes 2013-03-08 12:23:06 +05:30
Rushabh Mehta
2b861f3081 fix to blog and wnf backup does not backup files 2013-03-08 12:16:44 +05:30
Rushabh Mehta
177226616a fix to blog and wnf backup does not backup files 2013-03-08 11:56:52 +05:30
Rushabh Mehta
981db7b561 Merge branch 'master' into edge 2013-03-08 11:09:48 +05:30
Rushabh Mehta
6008f96540 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-08 11:01:07 +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
Anand Doshi
2911b48da6 fix in style settings 2013-03-07 19:23:30 +05:30
Rushabh Mehta
676a568f5a added blogger, updated style and blogs 2013-03-07 18:51:10 +05:30
Rushabh Mehta
9f3c727753 website navbar color change 2013-03-07 14:47:41 +05:30
Anand Doshi
d92f2a5688 Merge branch 'master' into edge 2013-03-07 11:38:17 +05:30
Anand Doshi
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +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
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
b21eb9ac09 added time log batch 2013-02-28 18:42:46 +05:30
Anand Doshi
3d2a9ca738 Merge branch 'master' into edge 2013-02-28 17:46:21 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
215fc02395 Merge branch 'master' into edge 2013-02-27 19:14:16 +05:30
Rushabh Mehta
891ff09ac1 website: fixed social icons and don't take lang from session for demo 2013-02-27 10:51:26 +05:30
Anand Doshi
dec6540039 Merge branch 'master' into edge 2013-02-25 13:17:47 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
9e02949821 updated language and separated slickgrid files 2013-02-25 11:05:27 +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