Commit graph

27 commits

Author SHA1 Message Date
Anand Doshi
7cde7fa507 [minor] Use from_async 2015-08-24 13:35:37 +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
Rushabh Mehta
74bc524416 [test] fix test_async 2015-08-14 15:08:40 +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
Pratik Vyas
422668a67f Async 2015-07-24 10:07:24 +05:30
Rushabh Mehta
562b1b2c50 [fixes] cleanup of web from, portal, login page 2015-06-01 17:14:53 +05:30
Rushabh Mehta
93878a9f03 [ping] pong 2015-05-13 08:23:04 +05:30
Rushabh Mehta
5bbe43ff78 [api] /api/resource/version 2015-05-05 17:46:16 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Anand Doshi
2fc7741e9c load boot in desk.html #999 2015-02-09 16:47:02 +05:30
Rushabh Mehta
5a0a9aac66 [refactor] frappe.widgets > frappe.desk 2014-09-29 12:21:12 +05:30
Anand Doshi
deaf82e46c Override Whitelisted Methods 2014-07-30 17:31:19 +05:30
Anand Doshi
412fab3e64 Fixed update sessions 2014-06-19 16:08:29 +05:30
Rushabh Mehta
0006170922 website cleanups 2014-04-21 22:11:09 +05:30
Rushabh Mehta
cfec573e77 more message fixes for translation 2014-04-15 22:54:11 +05:30
Rushabh Mehta
246a2a84fb fixed strings for translation 2014-04-15 14:40:00 +05:30
Rushabh Mehta
5d4e39bef6 frappe/frappe#478, more changes, removed bean 2014-04-03 14:30:49 +05:30
Rushabh Mehta
7bef30b270 frappe/frappe#478 2014-03-28 16:52:23 +05:30
Rushabh Mehta
d5d9c8c563 FormMeta, Form Load, refactored client side Model and Meta - #478 2014-03-28 11:34:40 +05:30
Anand Doshi
b6b9f0ab13 Fixes to Respond as Page, Error Page when not ajax, strip script and style tags from script and style blocks, hide sidebar and breadcrumbs if no content in them 2014-03-17 22:22:15 +05:30
Anand Doshi
d2f6905815 Handler response: each type of handler will create its own response 2014-03-13 13:04:25 +05:30
Anand Doshi
3444dd4a38 Refactored handler, catch exceptions, response codes and build response from app.py 2014-03-12 19:04:22 +05:30
Anand Doshi
d8fa3d8075 tabSessions engine=InnoDB 2014-03-05 15:22:45 +05:30
Anand Doshi
8333562e1a Build and Watch without passing site argument,
Finishing touches to Google OAuth
2014-02-27 13:11:40 +05:30
Anand Doshi
edbadc18b2 Changed frappe.conn to frappe.db 2014-02-26 12:35:02 +05:30
Pratik Vyas
7ac4682301 add conflict error code 2014-02-20 19:23:02 +05:30
Rushabh Mehta
024ddfcc5b -webnotes +frappe 💥 2014-02-14 14:55:11 +05:30