Commit Graph

84 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
a75efa76f9 added my account 2013-03-19 17:59:49 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Rushabh Mehta
37db223329 make blog as raw content 2013-03-15 11:29:25 +05:30
Rushabh Mehta
e9bef3cbf0 website module: minor updates 2013-03-14 15:39:43 +05:30
Rushabh Mehta
ebee1c7033 website module: minor updates 2013-03-14 14:33:31 +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
ae097f2209 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-03-12 21:38:38 +05:30
Anand Doshi
e5c395f8b6 fix in style settings color validation 2013-03-12 18:20:06 +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
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
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
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
80f7637ae6 added print width in txts of istable type doctypes 2013-03-07 11:37:33 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
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
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57: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
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
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
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30