Commit graph

378 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
f3046abd46 added in db.py, bulk unsubscribe optional 2014-01-20 15:30:39 +05:30
Rushabh Mehta
78f7ff3649 profile fixes and ctrl+s issue in firefox 2014-01-15 12:24:10 +05:30
Anand Doshi
e62a5b7e93 Fixes in scheduler logging, get_fullname and jinja environment 2014-01-14 18:50:26 +05:30
Anand Doshi
1be5479fab Fixed scheduler, webnotes scheduler events and delete doc 2014-01-13 21:23:16 +05:30
Rushabh Mehta
71b097f756 added get_file_url method 2014-01-09 18:52:53 +05:30
Rushabh Mehta
fa3e6e4f61 fix in nested set 2014-01-08 20:02:57 +05:30
Anand Doshi
aa966d569f Fix: webnotes post_install hook 2014-01-08 15:18:01 +05:30
Rushabh Mehta
c71bdcc7a1 login and other fixes 2014-01-07 09:11:50 +05:30
Anand Doshi
3968f66d5f Fixes for MySQL-python==1.2.5 2014-01-05 02:45:00 +05:30
Anand Doshi
8e44eefade Verify Command, Website and some minor fixes 2013-12-31 17:42:42 +05:30
Anand Doshi
44d258c8f8 Verified Command, fixes in webnotes.conn.touch 2013-12-31 17:42:41 +05:30
Rushabh Mehta
bb65bf27fd added get_creation_count and other fixes 2013-12-30 17:24:12 +05:30
Rushabh Mehta
44916d7f23 Added app creation boiler plate, cleaned up website settings 2013-12-27 17:33:24 +05:30
Anand Doshi
24f2445065 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
	webnotes/__init__.py
	webnotes/core/doctype/docfield/docfield.txt
	webnotes/core/page/data_import_tool/data_import_tool.js
	webnotes/defaults.py
	webnotes/install_lib/install.py
	webnotes/model/bean.py
	webnotes/model/code.py
	webnotes/sessions.py
	webnotes/tests/test_nested_set.py
	webnotes/widgets/page.py
2013-12-26 19:12:35 +05:30
Rushabh Mehta
cf71e3725a Merged with develop 2013-12-26 10:36:37 +05:30
Rushabh Mehta
e9e427d54b Fixed bugs in default cache clearing, created new Attach field type for attachments and other minor fixes with file uploads 2013-12-24 18:50:39 +05:30
Rushabh Mehta
f91cb781bd Merge pull request #1 from pdvyas/testing
CI
2013-12-23 22:48:31 -08:00
Anand Doshi
148c5d8891 [minor] pop socket timeout 2013-12-23 20:01:12 +05:30
Anand Doshi
df95128fed [minor] use mixin class for Timed_POP3 and Timed_POP3_SSL 2013-12-23 20:01:12 +05:30
Pratik Vyas
46b2a3019b Set timeout POP3 session using pop_timeout in conf.py 2013-12-23 20:01:12 +05:30
Anand Doshi
8a3be21704 Throttle POP pulling based on time and space (not the physics kind) 2013-12-23 20:01:12 +05:30
Anand Doshi
7720e999e9 [minor] [fix] error logging for pop 2013-12-23 20:01:11 +05:30
Anand Doshi
6268738cba specify max_email_size in conf.py to limit size of each email pulled using POP and the total size of all emails pulled in a single scheduler call 2013-12-23 20:01:11 +05:30
Pratik Vyas
6faafab586 [minor] fix file lock booboo 2013-12-23 20:01:11 +05:30
Pratik Vyas
4090932fca [minor] add locking to scheduler 2013-12-23 20:01:11 +05:30
Rushabh Mehta
9b4a20d5ab [permissions] Added Test Cases 2013-12-23 20:01:09 +05:30
Rushabh Mehta
25f07b8d32 Added Applications page and fixed issues in translations and hooks 2013-12-23 16:08:25 +05:30
Pratik Vyas
7b2ffcee6f iterate on other footers (smtp) 2013-12-23 11:54:52 +05:30
Nabin Hait
fa00d501aa Merge pull request #359 from anandpdoshi/hotfix-reply-to
[minor] [smtp] always add Reply-To header, add Date header
2013-12-16 02:08:51 -08:00
Anand Doshi
fa8ae0ecf6 [minor] [smtp] always add Reply-To header, add Date header 2013-12-16 14:48:17 +05:30
Anand Doshi
3f4516ad9f [minor] [scheduler] send scheduler errors as email digest 2013-12-16 13:51:09 +05:30
Rushabh Mehta
22a83f327c Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:49:48 +05:30
Rushabh Mehta
e665ce1907 notifications via hooks webnotes/wnframework#351 2013-12-13 15:34:12 +05:30
Rushabh Mehta
1243b71534 install, web serving, session booting 2013-12-12 19:11:07 +05:30