Commit graph

392 commits

Author SHA1 Message Date
Anand Doshi
fbae8c2df3 [minor] Unset Apply User Permissions in default permissions 2015-09-07 17:33:58 +05:30
Anand Doshi
ad9c500863 Exported all doctypes 2015-08-27 16:45:45 +05:30
Anand Doshi
c1ac1428e5 [minor] Website Settings - changed Misc to More Information 2015-08-27 15:51:10 +05:30
Anand Doshi
bf9ce00aea [enhancement] head_html in Website Settings to add HTML tags in the head section of each web page 2015-08-26 12:20:36 +05:30
Anand Doshi
9a9790a78c Merge branch 'commit-only-on-write' of https://github.com/rmehta/frappe into rmehta-commit-only-on-write
Conflicts:
	frappe/website/doctype/web_page/web_page.json
2015-08-17 14:14:10 +05:30
Anand Doshi
c9782e23e4 Merge remote-tracking branch 'frappe/develop' into v6-wip
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.json
	frappe/hooks.py
	frappe/model/document.py
	frappe/public/css/form.css
	frappe/public/less/form.less
	requirements.txt
	setup.py
2015-08-17 12:22:02 +05:30
Anand Doshi
dc89aee13f [fix] In Web Form, if logged in and no record found, set new=1 2015-08-12 19:23:49 +05:30
Anand Doshi
3afd9209e6 Merge pull request #1246 from anandpdoshi/hash-cache-fix
[fix] missing hash cache clearing and breadcrumbs fix
2015-08-12 12:34:52 +05:30
Anand Doshi
755c7be7fa [fix] missing hash cache clearing and breadcrumbs fix 2015-08-11 16:19:42 +05:30
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Rushabh Mehta
3a117b5656 [merge] develop 2015-07-30 16:06:06 +05:30
Rushabh Mehta
6985d4127e [fixes] document_type, added set-config in commands, prompt in form.js 2015-07-28 17:37:01 +05:30
Anand Doshi
30993bd04a [minor] changed modified for json files to affect #1215 2015-07-27 16:32:55 +05:30
Tsutomu Mimori
a6d3405ad4 Removed HTML from messages 2 2015-07-27 16:32:55 +05:30
Tsutomu Mimori
c9a651fe13 Removed HTML from messages 2015-07-27 16:32:54 +05:30
Anand Doshi
ec7763eb94 [minor] changed modified for json files to affect #1215 2015-07-27 12:15:05 +05:30
Anand Doshi
eb7d775e20 Merge branch 'develop' of https://github.com/tmimori/frappe into tmimori-develop 2015-07-27 12:06:53 +05:30
Anand Doshi
f2d3a6ef9b Implemented 'If Owner' in Role Permissions 2015-07-24 12:17:30 +05:30
Tsutomu Mimori
3a32e2c34d Removed HTML from messages 2 2015-07-23 21:22:28 +09:00
Tsutomu Mimori
a72b6d89de Removed HTML from messages 2015-07-23 21:12:56 +09:00
Anand Doshi
4e593711dc Merge pull request #1210 from rmehta/docs-update
[docs] update to auto documentation generator
2015-07-22 16:39:21 +05:30
Rushabh Mehta
18d0a886c0 [docs] update to auto documentation generator 2015-07-22 16:38:44 +05:30
Anand Doshi
4cabd4070f favicon and website theme 2015-07-22 16:26:34 +05:30
Anand Doshi
84579ed3bf [minor] website and avatar 2015-07-22 14:32:18 +05:30
Rushabh Mehta
1654c5b038 [minor] commit only if there were writes 2015-07-21 13:33:49 +05:30
Anand Doshi
cda51c115a Merge pull request #1195 from rmehta/permission-fix
[permission] removed un-necessary 'All' permissions
2015-07-13 16:50:56 +05:30
Rushabh Mehta
1cdfd7aa20 [permission] removed un-necessary 'All' permissions 2015-07-13 15:39:33 +05:30
Anand Doshi
1200d19618 [fix] Use user's language in website if logged in. Fixes print preview in user's language. 2015-07-13 14:59:03 +05:30
Rushabh Mehta
c54724ac27 [minor] label description 2015-07-07 16:37:05 +05:30
Rushabh Mehta
95164c4c9e [fix] set default lang for web pages 2015-07-02 11:35:46 +05:30
Anand Doshi
9a28afc17b [fix] Use favicon from Website Settings 2015-06-12 18:45:33 -04:00
Anand Doshi
a28c465ae1 Fixes in web forms 2015-06-11 00:50:25 -04:00
Pratik Vyas
58b97794ec [fix] abs_path 2015-06-03 17:30:18 +05:30
Nabin Hait
c0a56e8edf Update web_form_field.json 2015-06-03 11:12:02 +05:30
Anand Doshi
9b74b5ef62 [fix] header centering 2015-06-02 16:07:18 -04:00
Rushabh Mehta
9e8ad39879 Merge pull request #1140 from rmehta/portal-fixes
[fixes] cleanup of web from, portal, login page
2015-06-02 10:32:46 +05:30
Rushabh Mehta
2716f4a613 [fixes] [tests] web forms 2015-06-01 17:43:08 +05:30
Rushabh Mehta
562b1b2c50 [fixes] cleanup of web from, portal, login page 2015-06-01 17:14:53 +05:30
Pratik Vyas
dccebf938a [hotfix] revert abs_url 2015-06-01 17:01:10 +05:30
Anand Doshi
78b1e72633 [fix] replace filter with_leading_slash with abs_url, ensures consistent urls by changing relative to absolute urls wherever the filter is used 2015-05-29 14:30:15 -04:00
Rushabh Mehta
ef0c6b44f7 [email] consistent email, website branding 2015-05-26 12:17:33 +05:30
Anand Doshi
ee112c1628 [hotfix] injection issue. Fixes #1103 2015-05-12 11:21:08 -07:00
Rushabh Mehta
bf4e0681c4 [fix] command clear-website-cache 2015-05-12 11:45:14 +05:30
Rushabh Mehta
ad100e3054 [cache] fix for website, default, meta, etc 2015-05-08 18:04:13 +05:30
Anand Doshi
c15c6c4959 [minor] hljs css fix for html tags, {next}=blank if not found 2015-05-05 12:40:04 -07:00
Anand Doshi
2a783f2504 [website] if no sibling is found for current route, use parent for get_next() 2015-05-04 17:47:30 -07:00
Pratik Vyas
14d6510ce9 Fix website homepage validation 2015-05-04 15:21:25 +05:30
Anand Doshi
89e95cd6b1 Strip HTML tags and escape special characters in <meta>. Fixes frappe/erpnext_com#53 2015-04-30 15:09:09 -07:00
Rushabh Mehta
94c554c840 [fix] test cases 2015-04-29 11:37:11 +05:30
Rushabh Mehta
3fb635532f [fixes] test case, send to sender if in recipients, undefined in notes, permission test case fix, remove guest permission from blog post 2015-04-29 11:21:13 +05:30