Commit graph

79 commits

Author SHA1 Message Date
Sachin Mane
8d8358644c Fix JSON parse failure incase POST with no content is called. (#4743) 2018-01-03 17:48:10 +05:30
Faris Ansari
2724205955 Handle content_type application/json in request 2017-12-17 00:31:11 +05:30
Achilles Rasquinha
b8825ca116 Pure Python MySQL instead mysqlclient (with Python C API) (#4280)
* added PyMYSQL instead mysqlclient-python

* added pymysql import

* fixed db module import

* foxed self._conn wrapper

* updated cursor migration

* removed existent converters

* some more fixes towards API port

* modified travis

* updated doctype and revereted yml

* modified travis

* refreshed logging

* raw fix

* moved from hard coded constants to declarable instances

* moved from hard coded constants to declarable instances

* refactoring and logging

* moved to global import declaration

* fixed codacy

* unfixed codacy

* minor fix

* binary_type has a single

* deprecated alternative

* merged with latest

* fixed merge conflicts

* using deprecated alternative

* raw fix

* stupid fix

* using StringTypes instead

* brutal hack

* log

* tundebazy to the rescue

* fixed content_hash error

* frappe/database.py

* frappe/database.py

* updated database.py

* updated requirements

* updated requirements

* fixed codacy

* fixed codacy

* moved from DatabaseOperationalError to pymysql.InternalError

* moved from DatabaseOperationalError to pymysql.InternalError

* fixed codacy

* empty commit

* fixed codacy

* fixed codacy
2017-11-06 16:42:01 +05:30
Faris Ansari
d20f9e2895 Data Migration Tool (for hub) (#4144)
* migration tool

* custom field for primary key added

* foreign key and multiple linking F_key issue resolved

* refined code

* many-to-one mapping temp fix

* added support for pre-process + cleaned up code

* [various] fixes to setup wizard for developer mode, frappe.enqueue_doc, share with assign

* Refactor data migration module

* added migration for hub

* Add "Skip errors" in data import tool

* move db_set to document.py

* Add Data Migration Run

* Dynamic Migration ID

* move run() from Mapping to Run

* Push Deleted Documents

* fixes

* [migration] doc operation counts

* insert and update instead of push in connection

* fix count and total_pages, skip sync if total_pages is 0

* [migration] child tables

* fix complete()

* [page] remove required libs

* Add sidebar.js, rename old sidebar.js to form_sidebar.js

* [minor] get_empty_state fixes

* svg in icon

* remove image check

* fix codacy

* fix is_child_table check

* [connector] add get_list()

* Add test for Data Migration Run

* fix test

* truncate tabNote

* fix test

* sync todo with event to fix test

* fix db count

* [mapping] export Mapping to json

* Add docs for Data Migration Tool

* [migration] pull data as list, test case

* [hub] remove mapping export to files

* Pull refactor

* [test]

* Add comments

* [mapping] exec in mapping formula

* fix codacy

* fix codacy

* Remove exec for pre-process and post-process

* Add pre and post process for Push

* Remove formula

* fixes

* [refactor] add failed_log to pull, handle error in pull

* [test] Push, pull, update

* Fix codacy, fix insert_doc for pull

* Set migration id on successful insert

* fix update_doc

* fix update_doc

* method is a function

* child table mapping

* Refactor logging

* fix update_doc again

* fix hostname, password

* update docs, minors

* Remove assign_if_none

* Remove error handling from connection methods

* [refactor] Data migration run

* Break push stages into methods

* Migration run refactor

- fix test
- add separate fields for logging

* fix codacy

* fix hostname password

* fix test
2017-10-05 11:15:35 +05:30
Rushabh Mehta
faee27f773 [fix] [translation] switch to desk, #3328 2017-09-04 22:26:12 +05:30
Aditya Hase
24f2669795 Use str instead of bytes for keys in exports param 2017-09-04 16:05:57 +05:30
Rushabh Mehta
7dedc69461 [print-style] sync, fix tests and remove selection 2017-08-18 14:53:38 +05:30
Rushabh Mehta
19e9834850 [added] print style 2017-08-17 18:34:14 +05:30
Aditya Hase
0a6ecbf2c5 Don't unnecessarily encode os.path.join() 2017-08-11 18:09:32 +05:30
Rushabh Mehta
aa370aef36 [tests] less verbose logs 2017-08-10 11:02:36 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30
Rushabh Mehta
687af5ccc4 [minor] set response in app.py 2017-05-23 11:17:09 +05:30
Ashwini Save
ae1b456498 Added “POST” method in app.py and updated csrf_token accessible from “frappe.session” (#3302) 2017-05-19 11:14:08 +05:30
Rushabh Mehta
0a5df4fb4d [debug] show where permission is failing (#3264)
* [debug] show where permission is failing

* [fix] document.py
2017-05-11 11:46:47 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216)
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
2017-05-11 10:51:59 +05:30
Rushabh Mehta
4f899710f1 [fix] dont auto reload for CI 2017-04-27 16:27:31 +05:30
Rushabh Mehta
83045eb36c [enhance] handle session expired in a graceful manner (#3022) 2017-04-10 12:44:39 +05:30
Rushabh Mehta
042e2b09cb [design] Redesign, cleanup Login, Message pages (#2564)
* [cleanup] login, message pages

* [style] cleanups

* [cleanup]

* [cleanup] update password

* [fix] name for web form (fixes edit-profile)
2017-01-10 14:44:42 +05:30
Rushabh Mehta
ce88a60153 [logger] log in logs/frappe.log 2016-09-29 11:30:29 +05:30
Yaroslav Hreshko
7f571798d9 Fix issue: There is an error appear "ValueError: No JSON object could be decoded" when data is sent from SAP to ERPNext in http request body.
Signed-off-by: Yaroslav <jarsyxx@gmail.com>
2016-08-09 13:38:11 +03:00
Rushabh Mehta
5e3bcbe01f [tests] added basic tests for page and generator 2016-06-27 11:50:04 +05:30
Rushabh Mehta
620b2f82b3 [minor] get_gravatar in templates to not query and show 2016-06-08 16:03:56 +05:30
Anand Doshi
9800ac2d0a [cleanup] simpler logging system that does not affect other loggers 2016-05-06 20:28:10 +05:30
Rushabh Mehta
c955e001b4 [fix] minor update realtime 2016-02-17 16:32:48 +05:30
Anand Doshi
710206a96b Merge pull request #1565 from anandpdoshi/command/new-language
[enhancement] bench new-language
2016-02-15 16:36:50 +05:30
Rushabh Mehta
5b83a7abe3 [fix] capture error snapshot only for 500 errors 2016-02-15 15:42:42 +05:30
Anand Doshi
2e267a86b6 [fix] this might start showing logs in gunicorn logs 2016-02-12 11:42:52 +05:30
Anand Doshi
5faecb2bc1 [fix] add _comments column after request 2016-02-11 23:06:56 +05:30
Anand Doshi
e31ae68f74 [command] new-language lang_code app_name to create lang_code.csv in app_name/translations 2016-02-09 15:56:48 +05:30
Anand Doshi
d8f24822a9 [fix] cleanup, re-org and fixes to error snapshot 2015-12-16 19:39:56 +05:30
Maxwell Morais
26278cae85 Error Snapshot Feature 2015-12-16 19:39:55 +05:30
Anand Doshi
8a5addaae7 [feature] Private files. Fixes #927
- Option during upload + all new incoming email files will be private
- Paired with @rmehta
2015-12-09 14:02:14 +05:30
Anand Doshi
6084775ed0 Added CSRF token verification for desk 2015-09-21 11:41:06 +05:30
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