Commit graph

1535 commits

Author SHA1 Message Date
Rushabh Mehta
effe13925e [hot] revert domain_settings patch 2017-11-14 13:36:35 +05:30
Faris Ansari
cd32e87b98 [fix] Domain Setting patch (#4464)
* [fix] Domain Setting patch

* minor fix

* Update domain.py
2017-11-10 19:13:54 +05:30
Yaqin Shurrab
e8f4c16c7c [hotfix] bring throttling limit from site_config rather than a fixed "60" (#4400)
* bring throttling limit from site_config rather than from a fixed 60

* update key
2017-11-10 12:00:26 +05:30
pratu16x7
0685a56a53 [minor][hotfix] initialize script property in page.py 2017-11-08 18:01:45 +05:30
Saurabh
d66ef8fab5 Merge branch 'master' into staging 2017-11-08 12:03:44 +05:30
Saurabh
bdc87d437a [fix] set skip_errors params from data import tool (#4438) 2017-11-06 17:26:29 +05:30
Saurabh
3d4fadb3fa Merge branch 'master' into staging 2017-11-03 17:01:07 +05:30
Nabin Hait
010a32d95a
[fix] Header for sms send request (#4417) 2017-11-03 16:20:53 +05:30
rohitwaghchaure
de7c6be9ed [hotfix] User not able to modify modules in the user form (#4415) 2017-11-03 12:53:38 +05:30
Rushabh Mehta
42cd739668 [fix] role editor disable 2017-10-31 13:45:53 +05:30
Saurabh
68835eaa70 [fix] merge conflicts 2017-10-27 16:06:56 +05:30
Manas Solanki
8804db7249 fix the set query for the dynamic field (#4390) 2017-10-27 15:32:54 +05:30
Saurabh
caf9325557 Merge branch 'master' into staging 2017-10-26 20:52:30 +05:30
Rohit Waghchaure
c47cce1cbc [Fix] Don't show upgrade button for paid site 2017-10-26 20:48:11 +05:30
Saurabh
6147e4ecdc Merge branch 'master' into staging 2017-10-26 09:54:22 +05:30
Saurabh
c1af5db270 [fix] translate domain 2017-10-26 09:42:39 +05:30
Prateeksha Singh
6f891cc3bb make User Permissions importable (#4367) 2017-10-25 12:34:47 +05:30
Nabin Hait
8db6c97f8a Merge branch 'master' into staging 2017-10-23 13:02:09 +05:30
Nabin Hait
e4ec49a603 Merge branch 'master' into develop 2017-10-23 13:02:08 +05:30
Nabin Hait
c4adaa653a [fix] Two factor authentication via SMS (#4359) 2017-10-23 13:01:30 +05:30
mbauskar
ee7508347d resolved merge conflicts 2017-10-18 16:22:06 +05:30
Prateeksha Singh
1e253b9d13 [controls] Barcode Control (#4335)
* [start] display barcode based on input

* [wip]

* [barcode] use set_value

* parse and set

* remove quagga

* [barcode] set in db

* [fix] set height

* cleanup

* remove from build.json, require instead

* [fix] declare JsBarcode global in .eslintrc
2017-10-18 12:24:58 +05:30
Nabin Hait
aca3658f36 Removed SMS sender field from SMS Settings (#4334)
* Removed SMS sender field from SMS Settings

* patch for sms sender name
2017-10-17 15:09:13 +03:00
Shridhar Patil
51c944fd24 Hide email footer in report (#4323)
* Hide footer in auto email reports

https://github.com/frappe/frappe/issues/3249

* convert to int to comapare
2017-10-17 14:48:54 +05:30
crossxcell99
161ea7dc0e send via post request and specify header (#4316) 2017-10-17 12:46:58 +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
Rushabh Mehta
35a86a6d84 [fix] test_feedback_trigger.py 2017-10-17 11:33:56 +05:30
Rushabh Mehta
d5f0378f63 [fix] test_feedback_trigger.py 2017-10-17 10:43:21 +05:30
Makarand Bauskar
a6ed912924 [minor] display title in user mention instead of docname (#4217)
* [minor] display title in user mention instead of docname

* [minor] added the reference number/name

* [minor] if title is name then use the doc.reference_name instead of frappe.db.get_value
2017-10-17 09:32:51 +05:30
Makarand Bauskar
beeaa3f6ab [hotfix] no_socketio while uploading file for data-import-tool (#4306) (#4310) 2017-10-13 10:51:38 +05:30
Makarand Bauskar
da144db4ec [hotfix] no_socketio while uploading file for data-import-tool (#4306) 2017-10-13 10:47:11 +05:30
mbauskar
6640774b75 Merge branch 'master' into develop 2017-10-11 14:38:27 +05:30
Makarand Bauskar
ff954462a2 [minor] attach only image type files to Background Image field (#4283) 2017-10-11 14:37:12 +05:30
Makarand Bauskar
cf99dd268c [minor] update the doc status to Open for Received communication (#4295)
* [minor] update the doc status to Open for Received communication

* [minor] update the modified date on reply
2017-10-11 12:09:31 +05:30
Makarand Bauskar
91a6c5b246 [minor] create __init__ file, passed create_init=True explicitly (#4265) 2017-10-09 13:17:03 +05:30
Makarand Bauskar
ad596b56d7 [minor] don't update the parent's status to Replied on Communication Update (#4266) 2017-10-09 13:16:25 +05:30
mbauskar
2882a0193d Merge branch 'master' into develop 2017-10-05 13:35:51 +05:30
Prateeksha Singh
a9783a2e98 Upgrade button in sidebar, cleanup usage page (#4227)
* upgrade button in sidebar, cleanup usage page

* [fix] check if in trial for sidebar

* make upgrade box dismissable

* Update list_sidebar.js
2017-10-05 11:22:51 +05:30
Makarand Bauskar
a5bc359b10 [hotfix] validate the image field on doctype or customize form update (#4244) 2017-10-05 11:21: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
Nabin Hait
5d3f41bb26 Merge branch 'develop' into staging 2017-10-04 18:13:46 +05:30
Nabin Hait
86e283ecdb Merge branch 'master' into staging 2017-10-04 18:12:10 +05:30
Nabin Hait
936e84f345 Merge branch 'master' into develop 2017-10-04 18:12:10 +05:30
Makarand Bauskar
9b32196c11 [minor] don't update the parent status if comment is added (#4241) 2017-10-04 17:59:32 +05:30
Nabin Hait
451b48e4e2 Update document status via communication if not feed (#4234) 2017-10-02 15:55:46 +05:30
Achilles Rasquinha
7dd2c1c941 [FIX] #4223 (#4226)
* [FIX] #4223

* codacy fix

* fixed codacy

* fixed codacy
2017-10-02 13:21:48 +05:30
Rushabh Mehta
78995ceb3e [fix] text editor in firefox 2017-09-30 15:06:57 +05:30
Rushabh Mehta
2248dbc819 Merge pull request #4165 from achillesrasquinha/develop
[MAJOR] WebCamera attachments, Desktop Wiggling, bench command, minor UX, better dev workflow, MariaDB@10.2 fix
2017-09-29 15:09:41 +05:30
Rushabh Mehta
3cdebb9790 Merge pull request #4162 from rmehta/make-domain-on-import
[minor] automatically add restrict to domain if not added
2017-09-29 12:11:54 +05:30
Achilles Rasquinha
0aa0e79aa7 [fix] wiggling 2017-09-29 11:07:42 +05:30