Commit graph

4639 commits

Author SHA1 Message Date
Rushabh Mehta
c9b02586fc fixes to website 2014-02-10 17:51:08 +05:30
Pratik Vyas
375e89df95 convert nonce to str in verified command 2014-02-10 10:14:10 +05:30
Anand Doshi
dc13555b23 Prepend / in Relative URLs in the whole HTML document 2014-02-07 20:27:48 +05:30
Anand Doshi
1d64cd32fb Call render_blocks automatically 2014-02-07 19:34:38 +05:30
Rushabh Mehta
c160d2bb28 updates to config.setup 2014-02-07 19:05:05 +05:30
Rushabh Mehta
0f8bc6ba4d added setup (wip) and ui fixes 2014-02-07 18:14:38 +05:30
Anand Doshi
fa4e9540fe BugFix: Nested Set Model - on_trash and before_rename
Also, minor fix in bean
2014-02-07 14:51:50 +05:30
Rushabh Mehta
8c7b175ab0 ui fixes 2014-02-07 13:11:54 +05:30
Rushabh Mehta
1e5eeb79bc added application selection pages and some fixes to toolbar 2014-02-06 18:35:15 +05:30
Anand Doshi
e3795d7210 Moved Test Nested Set to erpnext's Test Item Group 2014-02-06 17:49:54 +05:30
Anand Doshi
b23f836abd Merge branch 'website-hierarchy' into 4.0.0-wip
Conflicts:
	webnotes/auth.py
	webnotes/handler.py
	webnotes/model/bean.py
	webnotes/webutils.py
2014-02-06 14:00:57 +05:30
Anand Doshi
270abe0eab Clear Website Cache, Website Group Cache, Post Cache (#421) 2014-02-06 12:48:09 +05:30
Rushabh Mehta
21c3eeb52a added splash for frappe: 2014-02-06 11:03:28 +05:30
Anand Doshi
d0b7f79068 Fixes in Templates (#421) 2014-02-05 20:09:55 +05:30
Rushabh Mehta
f41f219c33 fixes to api 2014-02-05 18:08:56 +05:30
Rushabh Mehta
7a1a4c872a added /api 2014-02-05 17:06:18 +05:30
Rushabh Mehta
a6aa718c56 minor fixes 2014-02-05 17:06:18 +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
Rushabh Mehta
75467d6196 Merge pull request #424 from akhileshdarjee/4.0-hotfix
Minor changes
2014-02-04 21:59:21 -08:00
Anand Doshi
1e6f58daf2 Website Group rendering (#421) 2014-02-03 20:23:14 +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
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