Commit graph

46 commits

Author SHA1 Message Date
Anand Doshi
65bc63f031 [fix] document refresh notification for same user in different tabs/sessions 2015-08-21 12:56:48 +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
Pratik Vyas
422668a67f Async 2015-07-24 10:07:24 +05:30
Rushabh Mehta
1654c5b038 [minor] commit only if there were writes 2015-07-21 13:33:49 +05:30
Rushabh Mehta
33632bedbb [minor] cleanup for random and messages in field group 2015-07-17 15:23:58 +05:30
Anand Doshi
05fe53c404 Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/comment/comment.py
	frappe/hooks.py
	frappe/model/db_query.py
	frappe/print/doctype/print_format/print_format.py
	frappe/utils/__init__.py
	requirements.txt
	setup.py
2015-04-06 12:05:50 +05:30
Anand Doshi
988401397c [fix] changed catching of duplicate entry and deadlock 2015-04-02 15:35:21 +05:30
Anand Doshi
2d6fec5954 File Manager: fixed unicode decode error 2015-03-23 16:07:42 +05:30
Pratik Vyas
3081b2df77 send errors in json if accept header is application/json 2015-03-09 15:33:18 +05:30
Anand Doshi
f70f409a64 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/bs.csv
	frappe/translations/ca.csv
	frappe/translations/de.csv
	frappe/translations/el.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hi.csv
	frappe/translations/hr.csv
	frappe/translations/it.csv
	frappe/translations/ja.csv
	frappe/translations/kn.csv
	frappe/translations/nl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/pt.csv
	frappe/translations/ru.csv
	frappe/translations/sr.csv
	frappe/translations/ta.csv
	frappe/translations/th.csv
	frappe/translations/vi.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	requirements.txt
	setup.py
2015-03-06 17:41:22 +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
74c21db40f Better message for lock wait timeout and deadlock 2015-02-27 13:38:29 +05:30
Anand Doshi
f6cdd4a655 Merge remote-tracking branch 'frappe/develop' into v5.0
Conflicts:
	frappe/__version__.py
	frappe/core/doctype/communication/communication.py
	frappe/core/page/desktop/desktop.js
	frappe/hooks.py
	frappe/translations/ar.csv
	frappe/translations/es.csv
	frappe/translations/fr.csv
	frappe/translations/hr.csv
	frappe/translations/id.csv
	frappe/translations/ja.csv
	frappe/translations/nl.csv
	frappe/translations/pl.csv
	frappe/translations/pt-BR.csv
	frappe/translations/ru.csv
	frappe/translations/tr.csv
	frappe/translations/zh-cn.csv
	frappe/translations/zh-tw.csv
	frappe/utils/email_lib/html2text.py
	setup.py
2015-02-24 18:06:16 +05:30
Anand Doshi
56ce1af598 [minor] fixes in Website Theme 2015-02-24 17:52:00 +05:30
Anand Doshi
f3b37df2dd [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:20 +05:30
Rushabh Mehta
d61b3c69cf Merge pull request #771 from anandpdoshi/anand-august-12
[fix] Get Notification Deadlock
2014-08-13 17:02:02 +05:30
Pratik Vyas
ac0d1abca1 Merge pull request #770 from pdvyas/hotfix-maintenance-mode
Hotfix maintenance mode
2014-08-13 10:56:06 +05:30
Anand Doshi
737a8dd5cb [fix] Get Notification Deadlock 2014-08-12 19:49:13 +05:30
Anand Doshi
e199712223 Further fixes in print 2014-07-25 13:01:53 +05:30
Pratik Vyas
18322d5099 fix whitespace 2014-07-07 16:11:37 +05:30
Pratik Vyas
2c3b170e17 add request exception logging 2014-07-07 09:52:13 +05:30
Anand Doshi
412fab3e64 Fixed update sessions 2014-06-19 16:08:29 +05:30
Pratik Vyas
de8f7daa6d fix maintenance spelling mistake 2014-06-18 15:58:13 +05:30
Rushabh Mehta
1ae1b23e11 show error message on 505 2014-05-29 14:10:27 +05:30
Rushabh Mehta
2f60578698 catch all errors in app.py 2014-05-26 12:52:32 +05:30
Anand Doshi
483466de22 Allow werkzeug debugging server to have multiple concurrent requests 2014-05-25 09:55:54 +05:30
Anand Doshi
a1bd2176fb NameError handling, fixed copy doc used in amend, handle tabs 2014-04-23 13:39:51 +05:30
Anand Doshi
8bb11e01be frappe/frappe#478 2014-04-02 16:38:16 +05:30
Anand Doshi
c10db3efae frappe/frappe#478 2014-04-01 12:26:34 +05:30
Pratik Vyas
36cc16f6a8 add maintainance mode 2014-03-28 00:03:44 +05:30
Pratik Vyas
afc0430f02 fix 500 on bad HTTP Host 2014-03-20 01:30:31 +05:30
Pratik Vyas
8df6919e4e check X-Frappe-Site-Name for site 2014-03-20 01:30:30 +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
Rushabh Mehta
8c77327060 bugfix in User 2014-03-14 15:19:23 +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
9eb55aa102 Fixed naming in response.py, build_response only if response.data does not exist 2014-03-12 19:27:05 +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
201385ec70 Added StaticDataMiddleware for serving files from mulitple sites, desktop background and positioning 2014-03-11 15:14:06 +05:30
Pratik Vyas
3081224bbc fix _response 2014-03-11 12:42:47 +05:30
Pratik Vyas
cc64d7a224 fix frappe.destroy in app.py 2014-03-11 11:29:20 +05:30
Pratik Vyas
be715d277b move download_backup to frappe.utils.response 2014-03-07 00:56:50 +05:30
Pratik Vyas
7668316916 only system manager can download backups 2014-03-07 00:11:20 +05:30
Anand Doshi
edbadc18b2 Changed frappe.conn to frappe.db 2014-02-26 12:35:02 +05:30
Pratik Vyas
f252b02280 fix site path in app.py 2014-02-17 20:24:10 +05:30
Pratik Vyas
ee883c1863 Make sites_dir configurable 2014-02-17 11:05:32 +05:30
Rushabh Mehta
024ddfcc5b -webnotes +frappe 💥 2014-02-14 14:55:11 +05:30
Renamed from webnotes/app.py (Browse further)