Commit graph

1430 commits

Author SHA1 Message Date
Rushabh Mehta
a6aa718c56 minor fixes 2014-02-05 17:06:18 +05:30
Akhilesh Darjee
16b6a379a0 minor change 2014-02-03 19:33:53 +05:30
Akhilesh Darjee
26212d7982 merge conflict fixed 2014-02-03 17:42:13 +05:30
Akhilesh Darjee
d90040a02e bulk email monor change 2014-02-03 16:47:18 +05:30
Nabin Hait
bb7fcc30a3 Fxed conflict 2014-01-31 17:01:20 +05:30
Rushabh Mehta
c48daa9e02 more fixes to email 2014-01-31 16:08:27 +05:30
Rushabh Mehta
5514364c27 bugfix in bulk mail 2014-01-31 14:49:36 +05:30
Rushabh Mehta
70167f795b updated boostrap to 3.1 2014-01-31 13:10:09 +05:30
Nabin Hait
e82aeb0274 Scrub urls of email attachments 2014-01-31 12:37:22 +05:30
Rushabh Mehta
9d41a2179a cleaning up emails 2014-01-30 14:57:48 +05:30
Nabin Hait
6154712b85 Merge branch 'develop' of github.com:webnotes/wnframework into 4.0.0-wip
Conflicts:
	config.json
	webnotes/build.py
	webnotes/translate.py
2014-01-30 13:03:17 +05:30
Rushabh Mehta
25db487617 minfor fixes 2014-01-29 15:27:42 +05:30
Anand Doshi
0c6cb7fb40 Removed max-width constraint from container 2014-01-28 21:00:12 +05:30
Anand Doshi
852d37c724 Don't walk in files and backups folder for translate 2014-01-28 12:53:09 +05:30
Anand Doshi
31012e964a Don't walk in files and backups folder for translate and pyc removal 2014-01-28 12:51:53 +05:30
Rushabh Mehta
bdf77ce134 added --use argument to set current site, so that it is not required in every webnotes statement 2014-01-28 11:49:17 +05:30
Rushabh Mehta
87db982cb9 bugfix in delete and clicking link in list will filter it 2014-01-28 11:34:56 +05:30
Rushabh Mehta
9ef68c4fc7 added new button in calendar views webnotes/erpnext#1288: 2014-01-28 11:34:56 +05:30
Anand Doshi
9cc283e842 Merge pull request #419 from pdvyas/agent-fixes
fix a blunder in update_site_config
2014-01-27 04:04:14 -08:00
Pratik Vyas
ccf58d9520 fix a blunder in update_site_config 2014-01-27 17:02:08 +05:30
Anand Doshi
c4ce0c869b Added requirement: inlinestyler, added html email template, expand partial links in bulk email text content 2014-01-27 14:56:24 +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
Rushabh Mehta
adc5bbd0fa added new restricted permission to force explict users 2014-01-22 17:54:14 +05:30
Rushabh Mehta
51b14f8684 updated bootstrap 2014-01-22 12:44:01 +05:30
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