Commit Graph

174 Commits

Author SHA1 Message Date
Anand Doshi
552093c3fd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac fix in print formats and file rename 2012-03-01 13:50:33 +05:30
Rushabh Mehta
df33cb3a39 added activity avatar and removed menus.css 2012-03-01 13:44:09 +05:30
Rushabh Mehta
fe521fdbc2 add messages to always show and add attribution to patch 2012-03-01 13:39:09 +05:30
Anand Doshi
0e140962b8 Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults 2012-03-01 12:16:02 +05:30
Rushabh Mehta
428929b1f7 fixed permissions 2012-03-01 11:24:45 +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
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
Rushabh Mehta
d01cc0bc50 messages and merge 2012-02-28 17:45:08 +05:30
Rushabh Mehta
75d8f51e7d messages and merge 2012-02-28 17:44:16 +05:30
Rushabh Mehta
aaf86ba4ef added users 2012-02-28 17:40:13 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Anand Doshi
ac144121ff fix in hover effect 2012-02-27 19:16:24 +05:30
Anand Doshi
f9f73bfa55 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-27 18:32:38 +05:30
Anand Doshi
e68a1e5ecc click effect on button 2012-02-27 18:31:15 +05:30
Rushabh Mehta
07a36a4baa messages 2012-02-27 18:17:57 +05:30
Anand Doshi
5b1beebd33 Changed position of menus in navbar 2012-02-27 17:17:48 +05:30
Anand Doshi
41ea46b4ed merge master with navupdate 2012-02-27 13:22:30 +05:30
Anand Doshi
0455ddfb98 Merge branch 'master' into navupdate
Conflicts:
	version.num
2012-02-27 13:21:48 +05:30
Anand Doshi
3dfa4401ff allow emails with uppercase 2012-02-27 13:19:47 +05:30
Anand Doshi
8e586cf180 allow emails with uppercase 2012-02-27 13:18:59 +05:30
Nabin Hait
8771da0a27 flixible width of buttom and class-name for each column in grid 2012-02-27 12:44:28 +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
d45ab64a85 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-24 19:28:09 +05:30
Anand Doshi
40ee8d6432 UI fixes in support ticket and desktop 2012-02-24 19:21:47 +05:30
Rushabh Mehta
a50b762d36 support link 2012-02-24 18:13:08 +05:30
Anand Doshi
3f321e759d Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-24 17:57:34 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Rushabh Mehta
f6be9b27bb changed icons to bootstrap 2012-02-24 16:36:58 +05:30
Rushabh Mehta
b73fa49f34 cleaned up kb 2012-02-24 15:07:39 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Anand Doshi
c05ee5bf64 patch to remove archive 2012-02-21 14:12:13 +05:30
Rushabh Mehta
6e156c748b moved to boostrap 2.0 2012-02-21 11:19:24 +05:30
Rushabh Mehta
4dc2f43c0d moving to bootstrap 2.0 2012-02-21 10:30:43 +05:30
Rushabh Mehta
09a897afe4 added selling-home 2012-02-20 18:30:52 +05:30
Anand Doshi
09ef7dc416 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-20 16:33:28 +05:30
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
13531b73eb form bugfix and otehr minor fixes 2012-02-20 12:35:23 +05:30
Rushabh Mehta
90aee34b10 password type issue 2012-02-17 15:50:07 +05:30
Rushabh Mehta
a2713f8285 fixed browser specific issues 2012-02-17 14:04:55 +05:30
Rushabh Mehta
aa848bee28 website css cleanups + dropdown in top toolbar 2012-02-17 12:06:33 +05:30
Rushabh Mehta
9670292543 img url bug 2012-02-17 10:38:49 +05:30
Rushabh Mehta
6f2b6319df file display issue 2012-02-16 15:35:05 +05:30
Rushabh Mehta
7b0502f9d3 build 2012-02-16 15:09:14 +05:30
Rushabh Mehta
9049117ede added error console 2012-02-15 14:02:20 +05:30
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Anand Doshi
04d47aae6f Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-14 12:46:44 +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
05f4c290ec added tinymce to all-app.js 2012-02-14 12:12:13 +05:30
Rushabh Mehta
868e084322 added jquery-ui to all-app.js 2012-02-14 12:03:02 +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
ff0946bbda naming fix in web page, list style 2012-02-13 15:26:17 +05:30
Anand Doshi
bae6908bdc added sync_with_gateway change function in wnf.py 2012-02-09 13:34:12 +05:30
Rushabh Mehta
f16e32eca1 report builder fix' 2012-02-08 16:16:28 +05:30
Rushabh Mehta
b8d6497818 many style fixes 2012-02-08 12:33:13 +05:30
Rushabh Mehta
3fd279977b website p sty;e 2012-02-08 10:44:02 +05:30
Rushabh Mehta
bd20d29dae pre style 2012-02-08 10:23:16 +05:30
Rushabh Mehta
f9620eaf44 fix to product, blog 2012-02-07 14:31:49 +05:30
Rushabh Mehta
518533fde0 added sitemap, rss feeds 2012-02-07 13:29:31 +05:30
Anand Doshi
67d2c8396c Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Rushabh Mehta
6147451da3 refactored patches, bug fix for assign_to 2012-02-04 09:53:25 +05:30
Rushabh Mehta
63d669f390 updated feed for comments and login 2012-02-03 12:56:12 +05:30
Rushabh Mehta
adc9a61bd7 bugfix 2012-02-02 16:45:26 +05:30
Rushabh Mehta
50e2cfe78e dateutil.js/patch fix 2012-02-02 16:40:01 +05:30
Rushabh Mehta
7018b19f42 added website settings, refactored home 2012-02-02 13:42:28 +05:30
Anand Doshi
354dd9b35a Allow changing export_rate if discount=0, then calculate discount based on ref_rate and export_rate (valid for non inclusive pricing) 2012-02-02 12:42:14 +05:30
Anand Doshi
75d30b803f Packing Slip and its patches 2012-02-02 11:38:15 +05:30
Rushabh Mehta
d47e1d14b7 added related page and other cleanups 2012-02-01 18:02:33 +05:30
Rushabh Mehta
9c69914cf6 todo fix 2012-02-01 15:03:54 +05:30
Rushabh Mehta
9ef63f93d6 moved back to 'index.cgi' model 2012-02-01 14:47:29 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Rushabh Mehta
3a751e8f82 added blog subscriber, unsubscribe 2012-01-27 18:00:14 +05:30
Anand Doshi
878b5ca71f print format - bypass printing table if table doesnt exist 2012-01-27 17:20:35 +05:30
Anand Doshi
2ccb811cc4 print format edits 2012-01-27 16:16:40 +05:30
Rushabh Mehta
c8d2e73ee6 added blog 2012-01-27 15:57:17 +05:30
Anand Doshi
f7595f4be1 fixes to print hide on empty cols 2012-01-27 13:55:20 +05:30
Anand Doshi
1b94c1399d print hide fix 2012-01-27 13:42:41 +05:30
Anand Doshi
b44da2813b Fix in print format hide empty field 2012-01-27 13:22:21 +05:30
Rushabh Mehta
51e51da63f added about_us 2012-01-27 12:17:09 +05:30
Rushabh Mehta
4adaae6974 version 2012-01-25 18:49:32 +05:30
Rushabh Mehta
949496c31b added website.page.contact 2012-01-25 18:48:46 +05:30
Anand Doshi
af1ad9a31e Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-01-25 17:27:57 +05:30
Anand Doshi
6e174cc2c4 Merge branch 'master' into latest
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
2012-01-25 17:21:14 +05:30
Rushabh Mehta
4b1fe0528a added home template 2012-01-25 15:06:28 +05:30
Anand Doshi
1605c334a6 In Print Format, hide columns without any content 2012-01-25 11:49:12 +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