| 
							
							
								 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 | 4a0cc249a9 | merge | 2012-03-01 13:59:47 +05:30 |  | 
			
				
					| 
							
							
								 Rushabh Mehta | b473a4d489 | added all_read condition to check if user can read | 2012-03-01 13:58:17 +05:30 |  | 
			
				
					| 
							
							
								 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 | fe521fdbc2 | add messages to always show and add attribution to patch | 2012-03-01 13:39:09 +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 | df78d20fab | is_onload is global now | 2012-03-01 10:56:50 +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 | 412a65c23c | user background | 2012-02-29 18:38:18 +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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 | 3966f1dc5d | added license files | 2012-02-23 12:35:32 +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 |  | 
			
				
					| 
							
							
								 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 |  |