Commit graph

1124 commits

Author SHA1 Message Date
Rushabh Mehta
88b28ff7a1 [cleanup] UI Fixes, minor 2013-11-06 11:29:39 +05:30
Rushabh Mehta
debad715a7 merge 2013-11-03 20:41:46 +05:30
Rushabh Mehta
42d8833260 [cleanup] UI fixes 2013-11-03 20:37:30 +05:30
Rushabh Mehta
7841a3da2d Merge pull request #273 from syedqadeer/master
updated the files to call the translating function
2013-11-02 23:25:29 -07:00
Rushabh Mehta
aa1e7ca155 Merge pull request #284 from miguelfontanes/master
Update scheduler.py
2013-11-02 23:23:36 -07:00
Rushabh Mehta
edaeee6f2f Merge pull request #260 from dploeger/dynamictranslation
Ability to use dynamic updates
2013-11-02 23:12:49 -07:00
miguelfontanes
3dffcadb9c Update scheduler.py
Add date/time to log
2013-11-01 11:25:00 -04:00
Anand Doshi
cafade56df [minor] [fix] plugin and install 2013-10-31 19:06:58 +05:30
Pratik Vyas
22749a9a59 [minor] fix debug log JSON serializable error 2013-10-31 12:32:17 +05:30
Anand Doshi
b83386822f [minor] fix in test cases 2013-10-28 19:55:43 +05:30
Anand Doshi
65771bd9a7 Merge remote-tracking branch 'origin/1310'
Conflicts:
	webnotes/model/code.py
	webnotes/widgets/query_builder.py
	webnotes/widgets/reportview.py
2013-10-28 19:34:22 +05:30
Nabin Hait
5fac634254 [fix] [minor] additional match condition specific to doctype 2013-10-28 14:37:38 +05:30
Nabin Hait
598ac510de [fix] [minor] update finished goods against production order 2013-10-25 15:39:17 +05:30
Nabin Hait
6a54002636 [merge] merged with master 2013-10-24 11:21:10 +05:30
Syed Qadeer
1af4f1c2fa [Fix] [Minor] locale_path is place inside the if condition 2013-10-23 11:11:47 +03:00
Syed Qadeer
4499a0c334 [Fix] [Minor] Updated to return response 2013-10-23 10:37:56 +03:00
Syed Qadeer
694b631ff1 Updated build_from_query_reports to generate locale from labels , query and also from js and py files 2013-10-23 09:38:17 +03:00
Syed Qadeer
5c8a530384 Fixed minor code in build_from_query_report 2013-10-23 06:35:42 +03:00
Syed Qadeer
3913106500 Fixed code to prepare report titles from database 2013-10-23 06:16:13 +03:00
Syed Qadeer
0a3685d2cf Created 'build_from_query_report' method in translate.py to create locale for the reports 2013-10-22 16:22:17 +03:00
Nabin Hait
090129cb33 [mapper] [minor] fields not to be mapped 2013-10-22 17:08:14 +05:30
Pratik Vyas
68b367e677 add bulk update to client 2013-10-22 16:02:51 +05:30
Syed Qadeer
fcb8b35cc5 Fixed minor code 2013-10-21 19:04:59 +03:00
Syed Qadeer
54c918425e Query Report Title Integration 2013-10-21 18:55:12 +03:00
Nabin Hait
780ebc2108 Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-21 18:33:23 +05:30
Nabin Hait
52a1d15c15 [fix] [minor] naming for amendment 2013-10-21 18:32:56 +05:30
Anand Doshi
f2ff76c153 [minor] get_site_status and update_site_config in wnf 2013-10-21 16:55:49 +05:30
Rushabh Mehta
7fada47dd6 [naming series] [minor] [fix] 2013-10-21 15:29:29 +05:30
Anand Doshi
f7460a8d0e Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-18 18:51:26 +05:30
Anand Doshi
5b6e37c8b3 [minor] [fix] Control Panel scheduler events 2013-10-18 17:45:38 +05:30
Rushabh Mehta
29c507f7a9 [minor] fixed metadata caching on client side 2013-10-18 17:28:35 +05:30
Anand Doshi
7ee1165fe8 [minor] webnotes.conn.touch, signature invalidation 2013-10-18 16:55:29 +05:30
Anand Doshi
fd84b62236 [minor] fixes in data import, serial no and setup wizard 2013-10-18 16:07:47 +05:30
Nabin Hait
e7fda4c4a4 Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-18 13:09:24 +05:30
Nabin Hait
06fe0ebfeb [minor] [fix] 2013-10-18 12:29:36 +05:30
Rushabh Mehta
0cc9b88e08 [editable] [minor] commonified editable and made blog also editable 2013-10-18 12:15:58 +05:30
Nabin Hait
5a7e7ccb5d Merge pull request #277 from akhileshdarjee/master
[feature] included single type doctypes in permission manager
2013-10-17 23:24:48 -07:00
Anand Doshi
8584c6ca02 [minor] removed references to server.py 2013-10-17 20:00:52 +05:30
Nabin Hait
60ca295147 Merge branches 'master' and 'master' of github.com:webnotes/wnframework into wsgi 2013-10-17 16:55:37 +05:30
Rushabh Mehta
ce86012d97 [editor] commonified inline and fixed toolbars [minor] 2013-10-17 15:40:26 +05:30
Pratik Vyas
734f2c15b9 [minor] WIP install broken 2013-10-17 15:03:38 +05:30
Nabin Hait
95a257cd40 [fix] Removed extra arguments from build_match_conditions 2013-10-17 14:59:13 +05:30
Anand Doshi
3169f0a693 [minor] get_plugin_path 2013-10-17 13:40:48 +05:30
Rushabh Mehta
fec045b6b3 [editor] added 'before_insert' in doc, added 'webnotes.local.rollback_observers', IMP: new name is set by bean before validate is called 2013-10-17 13:24:17 +05:30
Anand Doshi
047a44f32b Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-16 17:57:31 +05:30
Anand Doshi
7db58cee69 [minor] removed custom_script.js, plugin related cleanup 2013-10-16 17:57:22 +05:30
Rushabh Mehta
3b826eb93b [editor] [minor] fixed saving, dataurl, links, html editing 2013-10-16 17:55:49 +05:30
Anand Doshi
b6d932a13f [minor] don't rollback when running all tests, fixed test cases 2013-10-15 19:53:09 +05:30
Anand Doshi
184b6d68b1 Merge branch 'master' of github.com:webnotes/wnframework into wsgi
Conflicts:
	webnotes/utils/file_manager.py
2013-10-15 12:18:03 +05:30
Anand Doshi
92b62b2fc9 [minor] plugin architecture, first cut 2013-10-14 19:03:22 +05:30