Commit graph

4584 commits

Author SHA1 Message Date
Pratik Vyas
ccf58d9520 fix a blunder in update_site_config 2014-01-27 17:02:08 +05:30
Pratik Vyas
774ff77c1d fix update_site_config 2014-01-27 13:13:50 +05:30
Pratik Vyas
c830f56fb7 site name cannot be assets 2014-01-27 11:21:04 +05:30
Pratik Vyas
b97f467b98 separate public dir making from building 2014-01-27 11:02:55 +05:30
Pratik Vyas
3087069bce fix get_sites for 4.0.0 2014-01-27 11:02:55 +05:30
Rushabh Mehta
c5cd2082f2 Merge pull request #415 from akhileshdarjee/4.0-hotfix
small change in doclistview
2014-01-26 21:18:25 -08:00
Rushabh Mehta
97f8960350 fix #417 2014-01-27 10:47:17 +05:30
Rushabh Mehta
c5a0c52e77 fix #416 2014-01-26 11:48:31 +05:30
Anand Doshi
1f16c1d615 Fix: ToDo Patch and Notifications query 2014-01-24 21:48:06 +05:30
Anand Doshi
56720e6b2e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip
Conflicts:
	config.json
	webnotes/widgets/query_report.py
2014-01-24 21:47:49 +05:30
Akhilesh Darjee
7717232142 minor changes 2014-01-24 20:01:55 +05:30
Rushabh Mehta
9b1d91b8d1 ToDo Patch and List View 2014-01-24 18:59:56 +05:30
Anand Doshi
e803d84b93 Minor fix in query report and doc 2014-01-24 18:55:34 +05:30
Anand Doshi
553cf1a9ff Show Signup Message 2014-01-24 18:54:22 +05:30
Rushabh Mehta
145943569b more fixes to todo 2014-01-24 18:39:54 +05:30
Anand Doshi
330c54d479 Fix in cli.py --restore utility 2014-01-24 17:45:55 +05:30
Rushabh Mehta
f78fb6d410 ux fixes #1344, #1210, #1163, #1284 2014-01-24 15:25:39 +05:30
Akhilesh Darjee
895dd3e16c Merge branch '4.0.0-wip' of github.com:webnotes/wnframework into 4.0-hotfix 2014-01-24 11:15:38 +05:30
Akhilesh Darjee
155bba09f7 small change in doclistview 2014-01-24 11:14:00 +05:30
Nabin Hait
2b5a0ee5f6 Import default roles while making module and roles 2014-01-23 18:31:20 +05:30
Nabin Hait
d88b4a3b06 Fix in web page 2014-01-23 16:46:46 +05:30
Rushabh Mehta
7caa9d28a3 installer get_hooks fix 2014-01-23 16:42:50 +05:30
Rushabh Mehta
c4ef07662d added conditions in todo 2014-01-23 16:39:11 +05:30
Rushabh Mehta
563e70727e redesigned additional permissions via hooks and implemented in Event: 2014-01-23 16:26:44 +05:30
Nabin Hait
bfc27d9306 Merge branch '4.0.0-wip' of github.com:webnotes/wnframework into 4.0.0-wip 2014-01-23 15:36:05 +05:30
Nabin Hait
da5f460fe4 Fixes related to appification 2014-01-23 15:35:40 +05:30
Nabin Hait
6703a31be4 Merge pull request #414 from nabinhait/hotfix
customer login
2014-01-23 01:48:55 -08:00
Nabin Hait
ee625b8c71 Merge branch 'develop' of github.com:webnotes/wnframework into hotfix 2014-01-23 13:27:21 +05:30
Nabin Hait
b268b3d8d9 show last visited page afer login for customer login, if came from email link 2014-01-23 13:27:09 +05:30
Rushabh Mehta
adc5bbd0fa added new restricted permission to force explict users 2014-01-22 17:54:14 +05:30
Pratik Vyas
34e99cef2c Merge branch 'develop' 2014-01-22 16:02:47 +05:30
Pratik Vyas
e4ca25ce65 bumped to version 3.7.5 2014-01-22 16:32:47 +06:00
Rushabh Mehta
51b14f8684 updated bootstrap 2014-01-22 12:44:01 +05:30
Nabin Hait
a5f3462f5a Merge pull request #411 from akhileshdarjee/hotfix
enable checkbox when write permission
2014-01-21 22:35:21 -08:00
Rushabh Mehta
ce38c4ea98 webnotes/wnframework#193 2014-01-21 16:21:42 +05:30
Rushabh Mehta
36be63afe1 filters are not autocompletes webnotes/erpnext#1306 2014-01-21 15:41:02 +05:30
Rushabh Mehta
a8cc46fd9e grid, reportview fix webnotes/wnframework#293 webnotes/erpnext#1300 2014-01-21 12:41:00 +05:30
Akhilesh Darjee
4044b7b591 enable checkbox when write permission 2014-01-21 12:40:30 +05:30
Nabin Hait
08b79f11b8 Merge pull request #409 from akhileshdarjee/hotfix
Check box disabled when read permission
2014-01-20 20:54:02 -08:00
Akhilesh Darjee
93b5b877ff check box disabled when read permission 2014-01-20 20:47:27 +05:30
Pratik Vyas
e25225151a Merge branch 'develop' 2014-01-20 18:52:01 +05:30
Pratik Vyas
03879132e7 bumped to version 3.7.4 2014-01-20 19:22:01 +06:00
Nabin Hait
3ee75169b4 Merge pull request #408 from nabinhait/hotfix
Null issue fixed while value comparison
2014-01-20 05:01:31 -08:00
Rushabh Mehta
9caf081192 added explicit delete permissions 2014-01-20 17:53:50 +05:30
Rushabh Mehta
e2fe0a989b started separate delete permissions 2014-01-20 17:37:00 +05:30
Nabin Hait
af041d7713 Fixed conflict while merging with develop branch 2014-01-20 17:01:01 +05:30
Rushabh Mehta
7fa4ef9593 return appropriate HTTP error code (api) #377 2014-01-20 15:30:39 +05:30
Rushabh Mehta
f3046abd46 added in db.py, bulk unsubscribe optional 2014-01-20 15:30:39 +05:30
Nabin Hait
7ca61f86c4 Null issue fixed while value comparison 2014-01-20 11:21:49 +05:30
Pratik Vyas
28422a5018 Merge branch 'develop' 2014-01-17 16:56:26 +05:30