Commit graph

4619 commits

Author SHA1 Message Date
Anand Doshi
d0b7f79068 Fixes in Templates (#421) 2014-02-05 20:09:55 +05:30
Anand Doshi
a9a5f5cbf5 [pjax] PushState API + Ajax, Event Date Format as DD, d MM, yy hh:mm tt 2014-02-05 16:27:08 +05:30
Anand Doshi
1e6f58daf2 Website Group rendering (#421) 2014-02-03 20:23:14 +05:30
Anand Doshi
89e4f1a767 Way to render each template block separately, fixed pages and generators
Started with Website Group rendering (#421)
2014-02-03 11:35:18 +05:30
Anand Doshi
ffe082d7a9 Response to a Website Page Request would be json content if ajax else full page html
Related to (#421):
Fixed base template
Blog, Blog Post, Login, App pages
Started with porting Unit Template to Website Group Template
2014-02-03 11:35:18 +05:30
Anand Doshi
fc1b3d4c65 Website Sitemap using NestedSet (#421) 2014-02-03 11:35:17 +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
a3a0b5c03f added lxml dependency 2014-01-31 14:53:58 +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
c82c785c75 Merge pull request #422 from nabinhait/hotfix
Scrub urls of email attachments
2014-01-30 23:12:26 -08:00
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
Pratik Vyas
02336b5823 Merge branch 'develop' 2014-01-30 13:59:30 +05:30
Pratik Vyas
e222e6224c bumped to version 3.9.0 2014-01-30 14:29:30 +06:00
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
Nabin Hait
adfbabc810 Merge pull request #420 from akhileshdarjee/hotfix
Alphabetically listing of print formats
2014-01-29 22:47:10 -08:00
Akhilesh Darjee
12960331d0 ignored image for cleanup html in text editor 2014-01-30 12:14:34 +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
Akhilesh Darjee
d0bd7b8766 Merge branch 'develop' of github.com:webnotes/wnframework into hotfix 2014-01-28 12:14:38 +05:30
Akhilesh Darjee
e4fb5b7593 webnotes/erpnext#1348 alphabetically listing of print formats 2014-01-28 12:12:58 +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
5368f897e5 Merge branch 'develop' 2014-01-27 17:14:59 +05:30
Pratik Vyas
bcc4868c3b bumped to version 3.8.0 2014-01-27 17:44:59 +06: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
Rushabh Mehta
f2a9e52140 Merge pull request #418 from pdvyas/agent-fixes
Fixes for getting agent working
2014-01-26 23:49:08 -08:00
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
Anand Doshi
84f331766e Use svg font-face for chrome browser
Reference: http://www.adtrak.co.uk/blog/font-face-chrome-rendering/
2014-01-27 10:49:27 +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