Commit graph

1102 commits

Author SHA1 Message Date
Nabin Hait
6a54002636 [merge] merged with master 2013-10-24 11:21:10 +05:30
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
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
Anand Doshi
d274e04c1b Moved Custom Server Scripts to custom_scripts/doctype_name.py 2013-10-14 19:03:22 +05:30
Anand Doshi
9ffb1dbdd8 [minor] _dict copy method call 2013-10-14 19:03:21 +05:30
Rushabh Mehta
b0a45c4865 [web page] make editable for logged in user (alpha) 2013-10-14 18:14:41 +05:30
Pratik Vyas
2ce962ed7e custom scripts from file 2013-10-14 15:15:32 +05:30
Pratik Vyas
2dd28afcb7 add HashAuthenticatedCommand 2013-10-11 12:39:50 +05:30
Akhilesh Darjee
84de270744 [fix] [minor] merge conflict fixed 2013-10-11 11:06:11 +05:30
Akhilesh Darjee
8e7b85091f [fix] [minor] attachment related fixes 2013-10-11 11:02:34 +05:30
Anand Doshi
b28916d8bd [minor] fixes after merge with master 2013-10-10 18:44:18 +05:30
Rushabh Mehta
80c759c9ed [minor] [doctype] client script will keep the original wn.require if not found 2013-10-10 17:10:50 +05:30
Anand Doshi
c0ea5ecc2c Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-10 16:05:06 +05:30
Anand Doshi
4c76a474b1 Merged master into wsgi 2013-10-10 15:59:19 +05:30
Anand Doshi
e262098b1b [minor] [fixes] app.py, view in website button, test runner 2013-10-10 15:42:47 +05:30
Rushabh Mehta
780f5a1fa5 [custom script] [minor] fix indenting before saving 2013-10-10 15:05:24 +05:30
Anand Doshi
8cbd9b891b [minor] fixed globals and patch for wsgi migration 2013-10-10 12:05:34 +05:30
Rushabh Mehta
1567b04a8a [minor] added run_custom_method 2013-10-10 11:55:01 +05:30
Nabin Hait
6d20bda182 [minor] [fix] file manager saving issue with same file name 2013-10-09 18:48:13 +05:30
Nabin Hait
7c319b1084 [minor] [fix] file manager saving issue with same file name 2013-10-09 18:39:13 +05:30
Rushabh Mehta
beedb2e0ff [fixes] lots 2013-10-09 16:05:27 +05:30
Akhilesh Darjee
30275d826c Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-09 12:23:56 +05:30
Anand Doshi
2123b3002d [minor] [fix] get conf path 2013-10-09 12:18:48 +05:30
Anand Doshi
7c850f9cd3 Merge branch 'wsgi' of github.com:webnotes/wnframework into wsgi 2013-10-09 12:14:12 +05:30