Commit graph

1025 commits

Author SHA1 Message Date
Nabin Hait
627bc68cac Merge branch 'master' into staging 2017-10-25 14:01:07 +05:30
Nabin Hait
823366e6b9 Merge branch 'master' into develop 2017-10-25 14:01:06 +05:30
tundebabzy
09863bdf38 System Setting Password Policy Issue (frappe/erpnext#11255) (#4353)
* use get for getting key

* PEP8 changes
2017-10-25 12:37:14 +05:30
Faris Ansari
bc45beb868 Show record count in list header 2017-10-23 20:10:15 +05:30
Faris Ansari
5c9146fe9c [formatdate] Return empty string if no date provided (#4356) 2017-10-23 12:12:52 +05:30
mbauskar
ee7508347d resolved merge conflicts 2017-10-18 16:22:06 +05:30
Juan F Fernández
3c8689e4a2 [FIX] Fixed problem with margins in pdf (see #3451 #4235 #4239) (#4297) 2017-10-18 09:21:36 +03:00
Revant Nandgaonkar
4df6135c3c enqueue_after_commit option added to frappe.enqueue (#4167)
* enqueue_after_commit option added to frappe.enqueue

* Fixes

Codacy https://www.codacy.com/app/frappe/frappe/pullRequest?prid=934733
clear frappe.flags.enqueue_after_commit after executing enqueued jobs

* sync_global_search() uses enqueue_after_commit=True

* Update database.py

* webhooks enqueue after commit

* Update __init__.py
2017-10-18 11:43:02 +05:30
Aditya Hase
38d63f7dc7 Python 3 compatibility Frappe test fixes (#4318)
* Read image file in binary mode

* Read files in binary mode

* Don't use bytestrings unnecessarily

* Correctly convert byte strings to unicode in frappe.as_unicode

* Convert content to bytes before writing to file
2017-10-17 17:45:25 +05:30
Rushabh Mehta
f0e23a5a6c [refactor] domain and domain settings (#4163)
* [refactor] domain and domain settings

* [fix] test_domain.py

* [fix] patches

* [fix] domain activation after setup

* [fix] tests and lint

* [fix] tests and lint

* [enhance] better prompt naming

* [fix] setup wizard test

* [fix] testing

* [minor] new item in quick entry from form dashboard
2017-10-17 12:29:08 +05:30
Prateeksha Singh
7e9cce2d3b C3 to Charts (#4228)
* make AxisGraph

* remove jquery and snap

* [major] refactor, svg animations, rename to charts

* remove c3, d3

* [Charts] renaming and namespacing

* [fix] codacy

* Replace in grid report with plot, fixes
2017-10-17 12:02:39 +05:30
Pawan Mehta
181d493dc2 [fix] #4267 - remove hard coded web-server port in ui tests (#4268)
* [fix] #4267

* Update selenium_testdriver.py
2017-10-17 11:59:07 +05:30
Makarand Bauskar
fe75ffb8da [minor] fetch dictory value using get method instead of indexing (#4324) 2017-10-17 11:56:01 +05:30
mbauskar
025baf5b9f Merge branch 'master' into develop 2017-10-09 15:17:33 +05:30
rohitwaghchaure
705d48619c [Fix] Signature not displying in the PDF (#4271) 2017-10-09 08:46:35 +05:30
mbauskar
2882a0193d Merge branch 'master' into develop 2017-10-05 13:35:51 +05:30
rohitwaghchaure
192fae169c [Fix] Letter head not displaying proper in the pdf (#4251) 2017-10-05 13:01:35 +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
cf090c4edd Merge branch 'master' into staging 2017-09-29 16:12:37 +05:30
Rushabh Mehta
0a6b637681 [fix] default email subject should be title 2017-09-29 10:05:47 +05:30
Aditya Hase
9a0d6ce056 Don't index dict.items() 2017-09-27 01:08:07 +05:30
Aditya Hase
234fca90a3 Encode content if not encoded before hashing 2017-09-27 01:08:07 +05:30
Aditya Hase
635a48c337 Use zxcvbn-python instead of zxcvbn 2017-09-27 01:08:07 +05:30
Aditya Hase
62af6bf37d Encode unicode strings before hmac 2017-09-27 01:08:07 +05:30
Rushabh Mehta
556d21d7ca Merge pull request #4170 from maxtorete/fix_margins
Fixed problem with margin top and bottom overwritten in print format (#3451)
2017-09-26 12:47:30 +05:30
Ben Cornwell-Mott
0bc85c7431 Allow workbook pass in make_xlsx 2017-09-23 15:32:06 -07:00
maxtorete
c4ab2de7fd Fixed problem with margin top and bottom overwritten in print format (#3451) 2017-09-23 03:46:13 +02:00
Rushabh Mehta
80679f1b2f Merge pull request #4135 from mbauskar/backup
[minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.*
2017-09-20 11:22:00 +05:30
Rushabh Mehta
16148abc9b Update backups.py 2017-09-20 11:21:40 +05:30
mbauskar
6b5b78b3cf [minor] fixed uneven intendation, replaced spaces with tag 2017-09-19 16:12:22 +05:30
Nabin Hait
44277a35fb Delete backups if path exists 2017-09-18 15:41:00 +05:30
Rushabh Mehta
90fe449954 Merge pull request #4100 from rmehta/file-upload-socket
[feature] File upload using Socket.io by making chunks
2017-09-18 13:00:18 +05:30
mbauskar
bcc861ad28 [minor] change backup filename format to DDMMYY_HHMMSS_SITE_DATABASE.* 2017-09-15 15:32:11 +05:30
Rushabh Mehta
733e29569c Merge pull request #4123 from Zlash65/email-char
[Fix] Accentuated characters are valid email's sender name
2017-09-14 15:49:02 +05:30
mbauskar
e462a90d20 Merge branch 'master' into develop 2017-09-14 15:24:18 +05:30
Zlash65
5f068f7e4f accented characters are valid names 2017-09-14 14:20:50 +05:30
Rushabh Mehta
3b41d031a7 [fix] file_manager.py 2017-09-14 13:07:29 +05:30
Rushabh Mehta
1de26c939c [enhance] use socket-io to upload files 2017-09-14 13:07:29 +05:30
Rushabh Mehta
fd7e8eda62 [wip] file upload with socketio 2017-09-14 13:07:29 +05:30
Saurabh
cb46380e64 [fix] if supervisor is restarting, do not queue the jobs (#4112)
* [fix] if supervisor is restarting, do not queue the jobs

* Update scheduler.py
2017-09-14 11:03:56 +05:30
Nabin Hait
7266e673ac Merge branch 'master' into develop 2017-09-12 16:09:19 +05:30
pratu16x7
9cee53c33f [fix] specify exception 2017-09-08 16:03:51 +05:30
Rushabh Mehta
f66cfcece5 Update global_search.py 2017-09-08 15:47:32 +05:30
pratu16x7
1a3d0bb459 [fix] clear messages on exception 2017-09-08 15:46:03 +05:30
pratu16x7
0aaaca9b1a [fix] ignore results with non-existent doctypes 2017-09-08 15:45:36 +05:30
Rushabh Mehta
5338f5c95d [minor] list 2017-09-05 12:09:42 +05:30
Francisco
77c92c7e65 Goal Translatable 2017-09-04 15:17:25 -03:00
Aditya Hase
ac6ed0d328 Fix bleach_whitelist import 2017-09-04 16:05:57 +05:30
Aditya Hase
14800deea1 Use six.moves.urllib.parse.urljoin instead of urllib.basejoin 2017-09-04 16:05:57 +05:30
Aditya Hase
ba7412b621 Decode encryption key given by Fernet 2017-09-04 16:05:57 +05:30