Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,681 Commits 3 Branches 0 Tags 1 GiB
5893e143f4
Commit Graph

177 Commits

Author SHA1 Message Date
Rushabh Mehta
39489278ec update messages fix 2012-05-03 10:44:44 +05:30
Rushabh Mehta
4ee56c064e added ace editor 2012-05-02 15:30:15 +05:30
Rushabh Mehta
ef048f7256 fix to profile_settings 2012-05-01 14:56:20 +05:30
Anand Doshi
40808e18f1 minor fixes 2012-04-17 18:43:29 +05:30
Rushabh Mehta
2146fd17e7 new sales_browser 2012-04-17 12:40:37 +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
25bc68c7b2 fix in field names 2012-04-12 14:08:43 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
7e0479bc4c cleanup of search criteria 2012-04-05 18:27:56 +05:30
Anand Doshi
fa0cd89a7c change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Anand Doshi
5112b5b6b8 rerun of rename_dt 2012-04-02 19:12:29 +05:30
Anand Doshi
c88ae2be4d rename dt second cut 2012-03-30 18:18:36 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
a30fbd004e merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
Anand Doshi
2d4139cbeb sync_handler_merge 2012-03-23 14:46:07 +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
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +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
519f70b384 new autosuggest, other fixes 2012-03-09 16:44:21 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Anand Doshi
a872d81983 trying to fix support ticket 2012-03-06 17:09:53 +05:30
Anand Doshi
2b60484bab fix in reverted my company 2012-03-06 16:17:34 +05:30
Rushabh Mehta
e45ffd6daf activity date fix 2012-03-02 16:25:22 +05:30
Rushabh Mehta
37f531b6da fixes to profile update 2012-03-02 11:29:09 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Rushabh Mehta
df33cb3a39 added activity avatar and removed menus.css 2012-03-01 13:44:09 +05:30
Rushabh Mehta
5ce587be33 merge 2012-03-01 13:32:06 +05:30
Rushabh Mehta
4c1e9e7db4 added attributions pages 2012-03-01 13:30:34 +05:30
Anand Doshi
fba591cbb3 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 12:21:16 +05:30
Rushabh Mehta
111bca8220 activity image 2012-03-01 12:19:18 +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
b4a2f4c98f activty images, website heading fix 2012-03-01 11:49:54 +05:30
Rushabh Mehta
428929b1f7 fixed permissions 2012-03-01 11:24:45 +05:30
Rushabh Mehta
204e77d125 background, user_info 2012-02-29 19:09:20 +05:30
Rushabh Mehta
412a65c23c user background 2012-02-29 18:38:18 +05:30
Rushabh Mehta
79ae16506b minor fix 2012-02-29 15:23:25 +05:30
Rushabh Mehta
1572adf7f7 minor fix 2012-02-29 15:19:20 +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
aaf86ba4ef added users 2012-02-28 17:40:13 +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
05c339cea7 merge 2012-02-27 18:08:27 +05:30
Rushabh Mehta
fdea966198 messages 2012-02-27 18:03:54 +05:30
Anand Doshi
5b1beebd33 Changed position of menus in navbar 2012-02-27 17:17:48 +05:30
Anand Doshi
40ee8d6432 UI fixes in support ticket and desktop 2012-02-24 19:21:47 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Anand Doshi
eaaf65131b desktop: first cut 2012-02-24 15:29:07 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
17773d0763 added docdiff and removed un-necessary files 2012-02-22 15:55:41 +05:30
Rushabh Mehta
2478363bba Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-21 19:04:14 +05:30
Anand Doshi
ffbfd2c60a Update feed on submission 2012-02-21 18:15:31 +05:30
Rushabh Mehta
6e156c748b moved to boostrap 2.0 2012-02-21 11:19:24 +05:30
Rushabh Mehta
09a897afe4 added selling-home 2012-02-20 18:30:52 +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
Anand Doshi
761a044cd7 fix in user addition email sending.. 2012-02-16 12:47:11 +05:30
Rushabh Mehta
f27b67b474 fix in change password 2012-02-15 10:45:29 +01:00
Rushabh Mehta
533bc77976 rolling back gateway changes 2012-02-15 09:35:42 +01:00
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Rushabh Mehta
bfc03cf8bd Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 13:41:51 +01:00
Rushabh Mehta
a9bd79487d company whitelist fix 2012-02-13 13:41:45 +01:00
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Nabin Hait
7949b33b70 Logout session if user deleted 2012-02-13 12:43:38 +05:30
Anand Doshi
ad37575701 First name and last name in setup account dialog 2012-02-09 12:48:04 +05:30
Anand Doshi
95e89de21d Merge branch 'stable' into latest 
Conflicts:
	erpnext/home/page/event_updates/event_updates.js
 2012-02-09 12:23:15 +05:30
Anand Doshi
3801804a8a First Name and Last Name in setup account dialog box 2012-02-09 12:16:47 +05:30
Rushabh Mehta
b8d6497818 many style fixes 2012-02-08 12:33:13 +05:30
Rushabh Mehta
f9620eaf44 fix to product, blog 2012-02-07 14:31:49 +05:30
Rushabh Mehta
8b96b05163 fixes to products 2012-02-07 11:43:41 +05:30
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Rushabh Mehta
63d669f390 updated feed for comments and login 2012-02-03 12:56:12 +05:30
Rushabh Mehta
9c69914cf6 todo fix 2012-02-01 15:03:54 +05:30
Rushabh Mehta
ab1148cbc9 added products, custom pages and footer 2012-01-31 18:01:16 +05:30
Rushabh Mehta
bc5ec4f19e version 2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
2729123868 Fix add user from my company 2012-01-30 12:50:18 +05:30
Anand Doshi
5f29438b1c Fix in add user in my company 2012-01-30 12:44:59 +05:30
Anand Doshi
f3d3105d9a Password fix on add user 2012-01-30 12:40:07 +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
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
Anand Doshi
04a115e771 Fix: Logout user on disabling profile 2012-01-25 12:52:38 +05:30
Rushabh Mehta
865c00a79a started website 2012-01-24 14:33:21 +05:30
Rushabh Mehta
c5bf642c7d version 2012-01-23 16:18:34 +05:30
Rushabh Mehta
843db59fcb version fixes 2012-01-20 17:43:37 +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
764fdb942e updated account url and js version 2012-01-20 12:07:56 +05:30
Rushabh Mehta
b7d831b734 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 10:53:35 +05:30
Rushabh Mehta
0a5657809a fixes to add user 2012-01-20 10:52:53 +05:30
Anand Doshi
8c36f47ea6 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-19 17:13:43 +05:30