Commit graph

14565 commits

Author SHA1 Message Date
Davide Bortolami
8e6d72e6ef GSuite Documentation updates (#4570)
I will update this PR with various documentation improvements in the following days
2017-12-07 13:00:48 +05:30
Nabin Hait
48585dbc91 Merge branch 'master' into develop 2017-12-07 11:54:13 +05:30
Nabin Hait
5927c67130 Merge branch 'hotfix' 2017-12-07 11:54:13 +05:30
Nabin Hait
7909f9a08c bumped to version 9.2.22 2017-12-07 12:24:13 +06:00
rohitwaghchaure
32f35d278f [Fix] Make new button(+) not working for chinese language (#4581) 2017-12-07 11:51:37 +05:30
Zarrar
a0c1af4c11 [Fix] Data Import Tool (#4527)
* handle empty rows, validating naming-series

* Update importer.py
2017-12-07 11:47:41 +05:30
ci2014
01a955eb45 Allow developers to choose attachments (#4477)
* Allow developers to choose attachments

This change allows developers to choose attachments, even if there is a cur_frm object.

* Update communication.js

* Merge this.attachments and form attachments

* fix codacy
2017-12-06 20:02:13 +05:30
Prateeksha Singh
694ab62d4b
Merge pull request #4582 from Zlash65/fix-multicheck
[Minor] Multicheck control fix
2017-12-06 15:59:43 +05:30
Zlash65
817cc2927a minor fix 2017-12-06 15:41:25 +05:30
Nabin Hait
2d9b988b9a Merge branch 'hotfix' 2017-12-06 14:16:03 +05:30
Nabin Hait
b7acbcdeb2 Merge branch 'master' into develop 2017-12-06 14:16:03 +05:30
Nabin Hait
83a08130ab bumped to version 9.2.21 2017-12-06 14:46:03 +06:00
Achilles Rasquinha
d01ba3c051 Fixed Currency Precision during Display and Print (#4579)
* Fixed Currency Issue for Display and Print

* Fixed Codacy

* Update formatters.js
2017-12-06 14:15:18 +05:30
Prateeksha Singh
d1aa5c60b4 [Multicheck control] (#4529)
* multicheck control

* [checkboxes] replace in domain settings

* [checkboxes] use in setup_wizard domains

* [multicheck] minor

* [multicheck] set and get value as an array

* [multicheck] make controls.less

* basic view control with value as array object

* load active domains

* selenium helper: multicheck

* [multicheck] make field if not present

* [multicheck] append control in an HTML field
2017-12-06 13:25:33 +05:30
Zarrar
816f045f75 fix for header row not updating (#4576) 2017-12-06 11:58:47 +05:30
Saurabh
f2252568f6 [fix] sanitize input on search page (#4565) 2017-12-05 16:07:17 +05:30
Zarrar
eb2c7753c3 [Fix] Disallow Drag and drop across child-table (#4572)
* drag and drop across child-table disallow

* improvised
2017-12-04 16:00:09 +05:30
Zarrar
a576b9f0b6 Set proper fallbacks for start and end date (#4568) 2017-12-04 12:27:32 +05:30
Saurabh
930ea958bc Merge branch 'master' into develop 2017-12-01 16:19:17 +05:30
Saurabh
08b80bafde Merge branch 'hotfix' 2017-12-01 16:19:16 +05:30
Saurabh
42ac72a995 bumped to version 9.2.20 2017-12-01 16:49:16 +06:00
Faris Ansari
4078a543c4
[fix] frm.can_create when language is different (#4567) 2017-12-01 16:06:08 +05:30
Ameya Shenoy
7f9ec35391 [Bug] fixed install failure due to psycopg2 (#4566) 2017-12-01 14:59:54 +05:30
Manas Solanki
406bf1d962 reference doctype and name in the email queue while sending email from the auto email report (#4557) 2017-12-01 12:06:38 +05:30
tundebabzy
a5cd234326 remove psycop from requirements (#4562) 2017-12-01 12:06:15 +05:30
Faris Ansari
895f6605e9 [hotfix] doc.get (#4564) 2017-12-01 12:06:01 +05:30
Rushabh Mehta
5a9d38f767
[enhance] bench run-tests --doctype-list app/path/to/test.txt (#4561)
* [enhance] bench run-tests --doctype-list app/path/to/test.txt

* [fix] tests for doctype-list-path

* [fix] tests for doctype-list-path
2017-12-01 12:05:06 +05:30
Saurabh
cd8da87907 Merge branch 'master' into develop 2017-11-30 16:40:45 +05:30
Saurabh
605138f03e Merge branch 'hotfix' 2017-11-30 16:40:44 +05:30
Saurabh
a9801ba8e3 bumped to version 9.2.19 2017-11-30 17:10:44 +06:00
Ameya Shenoy
d746d1e8af Added test-list option to run-ui-tests (#4540)
* Added test-list option to run-ui-tests

will help bifurcating the ui tests into stages

* modified to add new parameters at the end
2017-11-30 16:26:43 +05:30
Rushabh Mehta
cfb34ca5d6 [fix] rename clientscriptAPI.js -> client_script_helpers.js 2017-11-30 14:45:17 +05:30
Rushabh Mehta
5fc14ee745 [fix] tests 2017-11-30 14:45:17 +05:30
Faris Ansari
74883d4f36 Set owner in Deleted Document (#4556) 2017-11-30 14:28:12 +05:30
Sushant Nadkar
0ca98a0c74 Added additional_offset parameter to scroll_to and login functions (#4545) 2017-11-30 14:27:53 +05:30
Zarrar
9927eecc9c fix issue with node delete for tree based doctypes (#4554) 2017-11-30 11:51:43 +05:30
rohitwaghchaure
ef7c6c3389 [fix] Item group test cases (#4555) 2017-11-30 11:48:59 +05:30
Zarrar
bef90ee10e making nestedset a bit more flexible (#4552) 2017-11-29 18:39:56 +05:30
Rushabh Mehta
3ed3b7badc [fix] tag error for hidden forms 2017-11-29 16:34:28 +05:30
Rushabh Mehta
7250481f38 [minor] make go premium button less annyoing 2017-11-29 16:10:38 +05:30
Nabin Hait
697a2be9f0 Merge branch 'creamdory-add_googlemaps' into develop 2017-11-29 15:51:09 +05:30
Nabin Hait
1ae64870be Minor fix in Google maps 2017-11-29 15:50:52 +05:30
Nabin Hait
0b8fe19224 Merge branch 'add_googlemaps' of https://github.com/creamdory/frappe into creamdory-add_googlemaps 2017-11-29 14:44:15 +05:30
Shreya Shah
ce066019ff [Fix] Trigger dirty when checkbox value is changed (#4541)
* trigger save on uncheck

* Update form.js

the reason for this condition was text editor
2017-11-29 12:28:20 +05:30
Saurabh
c042980765 Merge branch 'master' into develop 2017-11-29 11:14:05 +05:30
Saurabh
6591e5309e Merge branch 'hotfix' 2017-11-29 11:14:04 +05:30
Saurabh
e8d965452e bumped to version 9.2.18 2017-11-29 11:44:04 +06:00
Saurabh
1ce49c5b3e
Merge pull request #4544 from saurabh6790/usageinfo_fix
[fix] jinja syntax error in usage info
2017-11-29 11:12:57 +05:30
Saurabh
210685d39c [fix] jinja syntax error in usage info 2017-11-29 11:11:25 +05:30
Faris Ansari
fb6d079fe3 build.js - watch only .js files (#4520) 2017-11-29 09:33:43 +05:30