Commit Graph

301 Commits

Author SHA1 Message Date
Anand Doshi
951d8ec342 fix in issues arising due to wn.require 2012-05-10 14:19:11 +05:30
Rushabh Mehta
458ca8eddb cms fixes 2012-05-09 10:17:08 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Rushabh Mehta
d5e1031f42 floating logo on left 2012-05-02 17:44:59 +05:30
Rushabh Mehta
aa51377e94 custom startup 2012-05-02 13:03:41 +05:30
Rushabh Mehta
8eba118379 font fix 2012-05-02 09:45:28 +05:30
Rushabh Mehta
58bf2379a0 double dashbaord 2012-05-01 15:18:26 +05:30
Rushabh Mehta
ef048f7256 fix to profile_settings 2012-05-01 14:56:20 +05:30
Rushabh Mehta
30e3f157bc fix to startupjs 2012-05-01 14:07:41 +05:30
Anand Doshi
563fcc1b05 fix in startup.js 2012-04-30 21:06:31 +05:30
Rushabh Mehta
45850fe496 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:38:40 +05:30
Anand Doshi
84777ac457 change in expiry message 2012-04-30 18:33:32 +05:30
Rushabh Mehta
2ab4451d1b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:05:47 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Anand Doshi
72308564be Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 15:44:02 +05:30
Anand Doshi
2aa9ba63e3 fixes in select field type 2012-04-30 15:43:34 +05:30
Rushabh Mehta
963c651f2c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 14:22:50 +05:30
Rushabh Mehta
a4be4d3390 website, product and grid bugfix 2012-04-30 14:22:02 +05:30
Anand Doshi
b60807c325 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 12:23:03 +05:30
Anand Doshi
8cffe7e440 fix in support ticket, expiry banner 2012-04-30 12:13:51 +05:30
Rushabh Mehta
30cb5c20a1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:39:56 +05:30
Rushabh Mehta
389880d0b6 more website cleanups 2012-04-27 18:39:14 +05:30
Anand Doshi
1dac43159a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 15:31:35 +05:30
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Rushabh Mehta
702473d65e website updates 2012-04-26 19:01:35 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Rushabh Mehta
edab76b274 knowledge base cleanup 2012-04-18 16:55:43 +05:30
Anand Doshi
c9d1ac4112 fix - show about of application 2012-04-17 13:54:53 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
Rushabh Mehta
0c18b18b84 new framework build 2012-04-16 11:18:45 +05:30
Rushabh Mehta
cabfc65fe0 lib/py/webnotes/defs.py -> conf.py (see sample in lib/conf/conf.py) 2012-04-14 16:08:45 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Anand Doshi
ece64fa908 fixes 2012-04-10 19:18:00 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Rushabh Mehta
db05aacbc4 merge 2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14 website style fixes 2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Rushabh Mehta
b43f949e93 website smaller 2012-04-08 20:33:51 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
2012-03-27 19:37:10 +05:30
Anand Doshi
2d4139cbeb sync_handler_merge 2012-03-23 14:46:07 +05:30
Rushabh Mehta
b6f808846d website fixes 2012-03-23 14:19:49 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
	js/all-app.js
	version.num
2012-03-23 13:55:20 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Rushabh Mehta
983a171567 using font lato 2012-03-21 13:35:34 +05:30
Rushabh Mehta
9d0fc767b2 merge 2012-03-19 18:44:33 +05:30
Rushabh Mehta
d48417c93b slide navigation fixes 2012-03-19 18:42:13 +05:30
Anand Doshi
a7158f6ea9 fix in session expiry 2012-03-19 14:41:05 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Rushabh Mehta
5b9e0951d7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-15 07:21:43 +01:00
Anand Doshi
92da889d32 fix in report builder saving 2012-03-15 11:50:26 +05:30
Anand Doshi
96188f0310 sync with gateway moved to defs 2012-03-15 11:11:57 +05:30
Rushabh Mehta
3bbc7aeeb8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-14 07:58:10 +01:00
Anand Doshi
7854f81ca0 show todo, calendar and support desktop notifications 2012-03-14 12:01:13 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Nabin Hait
a0801f7e39 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-02 16:06:46 +05:30
Nabin Hait
40c514612b price list rate hiding issue 2012-03-02 16:06:33 +05:30
Anand Doshi
5cc8cd7dc1 do not record logins by demo@webnotestech.com 2012-03-02 15:42:08 +05:30
Rushabh Mehta
37f531b6da fixes to profile update 2012-03-02 11:29:09 +05:30
Anand Doshi
1e9b15eb5d Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-01 19:28:36 +05:30
Anand Doshi
e306a1f5e1 fix in sales and purchase common column hide 2012-03-01 19:25:33 +05:30
Rushabh Mehta
b5af807281 browser support 2012-03-01 18:58:29 +05:30
Rushabh Mehta
5d267a4ad7 browse support 2012-03-01 18:53:06 +05:30
Rushabh Mehta
70f7674aed browse support and images 2012-03-01 18:42:05 +05:30
Anand Doshi
48ca42beb9 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 14:54:01 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Rushabh Mehta
b473a4d489 added all_read condition to check if user can read 2012-03-01 13:58:17 +05:30
Rushabh Mehta
cc131af77a add messages to always show 2012-03-01 13:35:07 +05:30
Rushabh Mehta
4c1e9e7db4 added attributions pages 2012-03-01 13:30:34 +05:30
Rushabh Mehta
94a2fecf9d merge 2012-03-01 11:26:07 +05:30
Rushabh Mehta
428929b1f7 fixed permissions 2012-03-01 11:24:45 +05:30
Nabin Hait
bb4539e458 fixed conflict in version 2012-03-01 10:58:48 +05:30
Nabin Hait
284a07e23b if more info unchecked, more info in customer, supplier will be visible 2012-03-01 10:55:41 +05:30
Rushabh Mehta
a4f454faa0 module page link fix 2012-02-29 19:19:01 +05:30
Rushabh Mehta
204e77d125 background, user_info 2012-02-29 19:09:20 +05:30
Rushabh Mehta
4240ade0de user background 2012-02-29 18:40:21 +05:30
Rushabh Mehta
412a65c23c user background 2012-02-29 18:38:18 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Rushabh Mehta
12852e73ab added activity page 2012-02-29 15:11:06 +05:30
Rushabh Mehta
a38bbe28ce home page fixes 2012-02-29 10:55:43 +05:30
Rushabh Mehta
17da764d04 modules_setup 2012-02-28 18:56:56 +05:30
Anand Doshi
f9e4b16731 fix in scheduler related import issue 2012-02-28 11:31:46 +05:30
Anand Doshi
ac144121ff fix in hover effect 2012-02-27 19:16:24 +05:30
Anand Doshi
2b8c4d78f3 reload messages 2012-02-27 18:42:00 +05:30
Rushabh Mehta
07a36a4baa messages 2012-02-27 18:17:57 +05:30
Rushabh Mehta
05c339cea7 merge 2012-02-27 18:08:27 +05:30
Rushabh Mehta
fdea966198 messages 2012-02-27 18:03:54 +05:30
Anand Doshi
b25b4b7624 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 17:19:03 +05:30
Anand Doshi
5b1beebd33 Changed position of menus in navbar 2012-02-27 17:17:48 +05:30
Rushabh Mehta
a3211d3e94 calendar bug fixes 2012-02-27 12:54:47 +05:30
Rushabh Mehta
aa999df088 calendar fix 2012-02-27 12:54:04 +05:30
Anand Doshi
01a7558589 added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background 2012-02-24 19:35:09 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
1a35574afe redesigned scheduler 2012-02-23 11:46:28 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
2478363bba Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-21 19:04:14 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Rushabh Mehta
6e156c748b moved to boostrap 2.0 2012-02-21 11:19:24 +05:30
Rushabh Mehta
d25e0957d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-20 12:06:55 +01:00
Anand Doshi
c3023be794 notifications of todo items 2012-02-20 16:31:55 +05:30
Rushabh Mehta
3f29b85f5d 2 col layout in form, docbrowser and home 2012-02-20 15:40:29 +05:30
Rushabh Mehta
7c76f80966 gateway patch 2012-02-16 10:58:45 +01:00
Rushabh Mehta
533bc77976 rolling back gateway changes 2012-02-15 09:35:42 +01:00
Rushabh Mehta
c9b10fd8d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 17:25:40 +05:30
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Anand Doshi
737c2f9432 fix in login as 2012-02-14 16:16:13 +05:30
Anand Doshi
b2be11cad1 error due to old packing slip hide fields in feature setup 2012-02-14 12:45:55 +05:30
Rushabh Mehta
afaac60982 made all.js and all.css and all guests share same session 2012-02-14 11:44:13 +05:30
Rushabh Mehta
b8d6497818 many style fixes 2012-02-08 12:33:13 +05:30
Rushabh Mehta
f35992f695 top bar to accept url 2012-02-07 10:39:17 +05:30
Rushabh Mehta
63d669f390 updated feed for comments and login 2012-02-03 12:56:12 +05:30
Rushabh Mehta
7018b19f42 added website settings, refactored home 2012-02-02 13:42:28 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Rushabh Mehta
51e51da63f added about_us 2012-01-27 12:17:09 +05:30
Rushabh Mehta
949496c31b added website.page.contact 2012-01-25 18:48:46 +05:30
Rushabh Mehta
4b1fe0528a added home template 2012-01-25 15:06:28 +05:30
Rushabh Mehta
9c7a01ade9 starting up 2012-01-25 11:04:54 +05:30
Rushabh Mehta
a8ad3907db added website page, home, patch 2012-01-25 10:37:35 +05:30
Rushabh Mehta
5b9270981c added css: 2012-01-24 15:16:06 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Rushabh Mehta
49ebfb6a30 version 2012-01-20 15:32:18 +05:30
Rushabh Mehta
8c309bee53 bootstrap toolbar 2012-01-20 13:47:16 +05:30
Rushabh Mehta
f2c4c4231f minor bugfixes 2012-01-19 11:43:34 +01:00
Rushabh Mehta
d31bf62c9a fixed patches, small bugs 2012-01-19 15:09:49 +05:30
Rushabh Mehta
88ba7b86dc fixes to login check 2012-01-18 06:18:52 +01:00
Rushabh Mehta
bedc1fe534 new login authentication 2012-01-17 18:17:06 +05:30
Anand Doshi
90f6e55c29 Changes in Inclusive Rate Taxes precision 2012-01-16 14:13:39 +05:30
Anand Doshi
a31fd1080b Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link 2012-01-06 16:27:54 +05:30
Anand Doshi
523f3a0ea2 Added Administrator to exception list of users to be logged out post login 2012-01-05 14:34:30 +05:30
Anand Doshi
a6272af68a Fix to logout previous session on login 2012-01-03 17:02:20 +05:30
Anand Doshi
b63a007c91 Fixed logout issue 2012-01-03 16:11:04 +05:30
Anand Doshi
d34ff76526 Fixed logout issues 2012-01-03 16:00:03 +05:30
Anand Doshi
9fdee387ea Allow demo user to have multiple sessions 2012-01-03 11:26:00 +05:30
Anand Doshi
d56d57d205 Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login 2012-01-02 16:25:05 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Nabin Hait
38d24534d7 Recurring invoice checkbox added in features setup 2011-12-06 19:04:21 +05:30
Rushabh Mehta
efd222b6ac logout fix 2011-11-08 10:39:52 +05:30
Rushabh Mehta
790f453490 version update for wnf 2011-10-19 14:06:32 +05:30
Nabin Hait
c1d4281718 packing slip related changes 2011-10-11 12:50:55 +05:30
Rushabh Mehta
5f66d60bdd fixed login url 2011-10-11 10:58:11 +05:30
Nabin Hait
b30c4a6611 Fieldname changed in Features Setup 2011-10-05 11:36:16 +05:30
Rushabh Mehta
32e00cb050 missing buttons 2011-09-16 16:28:35 +05:30
Rushabh Mehta
5ede3e8411 fixes to home (multiple loading) 2011-09-08 14:16:34 +05:30
Rushabh Mehta
11c6be065a ready for 0.1 2011-09-06 15:50:01 +05:30
Rushabh Mehta
b5717bd807 patch etc fixes 2011-09-06 12:46:33 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30