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 |
|