Commit Graph

213 Commits

Author SHA1 Message Date
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
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
83833ce423 website.css, extended margin 2013-02-21 14:40:14 +05:30
Rushabh Mehta
b0a0a59404 website.css, extended margin 2013-02-21 14:32:54 +05:30
Rushabh Mehta
93313cfb93 Merge branch 'master' of github.com:webnotes/erpnext 2013-02-21 14:26:34 +05:30
Rushabh Mehta
78db3ec2dd added responsive layout with groups 2013-02-21 14:25:30 +05:30
Anand Doshi
51fc7c0683 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-21 12:23:58 +05:30
Rushabh Mehta
1e037fbe29 urllib quote encoding fix 2013-02-21 11:11:21 +05:30
Anand Doshi
59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt
2013-02-21 11:09:43 +05:30
Rushabh Mehta
1c36697556 updates to website footer 2013-02-21 10:54:04 +05:30
Rushabh Mehta
f2b17d91a1 updates to website footer 2013-02-21 10:49:37 +05:30
Rushabh Mehta
87e4801946 website settings social icons 2013-02-20 15:02:21 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
9c880da381 removed old doctypes 2013-02-18 14:28:34 +05:30
Rushabh Mehta
c06ce25470 updated translations 2013-02-18 14:24:05 +05:30
Anand Doshi
9b051db7d6 show page name in web page list view 2013-02-12 13:04:25 +05:30
Anand Doshi
c9629a481d fetch favicon from website settings 2013-02-12 12:54:58 +05:30
Anand Doshi
c5377e2583 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-02-12 11:38:56 +05:30
Anand Doshi
e1ad443c91 re-adding description as it is distorting list 2013-02-11 20:28:56 +05:30
Anand Doshi
d8c3aa22a0 removed product param in get_product_list 2013-02-11 19:33:33 +05:30
Anand Doshi
120b92e5e6 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-02-11 15:55:58 +05:30
Anand Doshi
954f897572 in product listing, don't truncate description 2013-02-11 15:55:30 +05:30
Rushabh Mehta
0e5401ccbf sales communication fix for status 2013-02-11 15:08:24 +05:30
Rushabh Mehta
176829e53c added status to Contact and fix bug in communication pull 2013-02-11 14:54:30 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Anand Doshi
18a0c58cee fix in blog comment 2013-02-10 13:10:53 +05:30
Anand Doshi
9e830ec711 show sub item group items only if show in website is checked for them 2013-02-08 20:08:46 +05:30
Rushabh Mehta
fdc629be4d get post fix 2013-01-31 22:05:39 +05:30
Rushabh Mehta
92455dc7ae blog textarea 2013-01-31 11:24:22 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
317177afd2 updated languages 2013-01-24 18:18:39 +05:30
Rushabh Mehta
ad14943c3f added arabic 2013-01-24 17:37:43 +05:30
Rushabh Mehta
4c17718b4c added portuguese 2013-01-24 16:31:23 +05:30
Rushabh Mehta
908d09d058 added spanish 2013-01-24 15:55:30 +05:30
Rushabh Mehta
cd4a854a28 converted currency to float and removed level 1 permissions 2013-01-22 15:10:25 +05:30
Rushabh Mehta
28b0b1cba4 removed key_list in memcache 2013-01-22 11:04:55 +05:30
Anand Doshi
5a6bd199b8 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-21 19:03:26 +05:30
Anand Doshi
fc36e57233 fixes in setup control and website contact helper 2013-01-21 19:02:58 +05:30
Rushabh Mehta
f6f8ddac30 contact us cache refresh issue 2013-01-21 18:50:03 +05:30
Rushabh Mehta
bb9968491b added report permissions to txt files 2013-01-21 14:22:07 +05:30
Rushabh Mehta
3ab6c5fca9 appraisal, don't validate points for self-appraisal 2013-01-19 10:54:03 +05:30
Rushabh Mehta
80721518e3 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:23:07 +05:30
Nabin Hait
80c681294c fixes in website page naming 2013-01-17 13:24:51 +05:30
Nabin Hait
feee252093 fixes in website page_name for item 2013-01-17 13:03:30 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Rushabh Mehta
2e5db35856 added automatic lead creation for sales email id 2013-01-16 11:34:26 +05:30
Rushabh Mehta
29b8093ec4 tinymce fixes 2013-01-14 18:47:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Rushabh Mehta
cd7a02c489 added workflow help, fixed button primary action in form and refactored permissions 2013-01-04 14:03:36 +05:30
Nabin Hait
d68fa3b953 fixes in website utils 2013-01-01 12:05:13 +05:30
Rushabh Mehta
5f183982cd update webpage name to be much longer, remove .html from links and refactor newsletter layout 2013-01-01 10:55:58 +05:30
Anand Doshi
a5e4fec00d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-30 19:59:01 +05:30
Anand Doshi
65cef74168 before delete page cache, check if page name exists 2012-12-30 19:58:24 +05:30
Nabin Hait
833d7a65d5 small fixes in product caching 2012-12-30 19:56:57 +05:30
Rushabh Mehta
84adf1bb7f page refresh title issue fixed 2012-12-28 10:30:46 +05:30