Commit graph

13597 commits

Author SHA1 Message Date
rohitwaghchaure
824094830c [Enhance] selector by class name in for UI test cases (#4022) 2017-08-31 18:16:06 +05:30
mbauskar
677abfb57e Merge branch 'master' into develop 2017-08-31 15:31:04 +05:30
mbauskar
03b9f8486e Merge branch 'hotfix' 2017-08-31 15:31:04 +05:30
mbauskar
029cb358ab bumped to version 8.9.1 2017-08-31 16:01:04 +06:00
mbauskar
14533ed2c5 Merge branch 'develop' into staging 2017-08-31 15:29:24 +05:30
Zarrar
9262ae0899 BOM issue - Make a new Item button was not working (#4021)
* new doc creation fix

* made requested changes
2017-08-31 14:45:00 +05:30
Rushabh Mehta
0b22ead9b4 Merge pull request #4018 from mbauskar/unicode-decode-fixes
[hotfix] fixes for UnicodeDecodeError while import translation
2017-08-31 13:40:47 +05:30
mbauskar
8eaf1c3e15 [hotfix] fixes for UnicodeDecodeError while import translation 2017-08-31 13:21:00 +05:30
Rushabh Mehta
b5c449f860 Merge pull request #4008 from rmehta/list-duplicates
[minor] show duplicates instead of hiding
2017-08-31 11:05:05 +05:30
Rushabh Mehta
039380a6c6 Merge pull request #4012 from mbauskar/docfield
[hotfix] only display allow_after_submit property if doctype is submittable
2017-08-30 14:07:30 +05:30
Rushabh Mehta
0214a3717a Merge pull request #3990 from manassolanki/listview-sorting
sorted the select field options in permission manager as per translated string
2017-08-30 14:04:49 +05:30
mbauskar
3e3b20d646 [hotfix] only display allow_after_submit property if doctype is submittable 2017-08-30 01:04:09 +05:30
Rushabh Mehta
b7f3282bf6 Merge pull request #4011 from mbauskar/incoming-email
[hotfix] dont update the modified date for already fetched email (communication)
2017-08-30 00:52:37 +05:30
mbauskar
36e7caa651 [minor] translated the CC & Standard Reply field of email dialog 2017-08-30 00:20:25 +05:30
mbauskar
cd989da770 [hotfix] dont update the modified date for already fetched email (communication) 2017-08-30 00:13:35 +05:30
mbauskar
f8e025d9e9 Merge branch 'master' into develop 2017-08-29 20:24:39 +05:30
mbauskar
28a99fc819 Merge branch 'staging' 2017-08-29 20:24:38 +05:30
mbauskar
1884269e95 bumped to version 8.9.0 2017-08-29 20:54:38 +06:00
Rushabh Mehta
a0436456f8 [tests] fix 2017-08-29 15:31:04 +05:30
Rushabh Mehta
2ad3d77b88 [tests] fix 2017-08-29 14:27:46 +05:30
Rushabh Mehta
ebc6f60af7 [tests] increase rendering timeout? 2017-08-29 13:45:03 +05:30
Rushabh Mehta
0dfd41e549 [minor] show duplicates instead of hiding 2017-08-29 13:32:04 +05:30
Rushabh Mehta
124444b56f [fix] new Promise 2017-08-29 12:25:44 +05:30
Rushabh Mehta
ab0f433e43 Merge pull request #3998 from Zlash65/workflow
[UI Test] Workflow creation and working
2017-08-29 11:50:52 +05:30
Rushabh Mehta
a16ac7a7be Merge pull request #4006 from almeidapaulopt/gsuite_bugs
Fixes select template bug #10164
2017-08-29 11:47:03 +05:30
Zlash65
b1d4fcebb7 made requested changes 2017-08-29 11:14:26 +05:30
Zlash65
b7b77609ce added workflow mechanism to add user 2017-08-29 11:08:40 +05:30
Rushabh Mehta
91d8adc1b0 [fix] contact.py 2017-08-29 10:34:20 +05:30
Paulo Almeida
360b03ee2e correct select template bug #10164 2017-08-28 16:04:38 +01:00
Ashwini Save
6a42fa0f56 Tree print (#3980)
* Warehouse tree : print option.

* Chnages in print layout of Warehous tree view suggested by Faris
2017-08-28 18:06:14 +05:30
Saurabh
24455398b5 Merge branch 'master' into staging 2017-08-28 16:15:39 +05:30
Saurabh
5070cbdab8 Merge branch 'master' into develop 2017-08-28 16:15:39 +05:30
Saurabh
82193d8fcf Merge branch 'hotfix' 2017-08-28 16:15:38 +05:30
Saurabh
4948353f87 bumped to version 8.8.5 2017-08-28 16:45:38 +06:00
Rushabh Mehta
775b85c1e9 Merge pull request #4003 from rmehta/hotfix
[fix] grid trigger issues
2017-08-28 16:02:33 +05:30
Rushabh Mehta
00ec6476ee Merge pull request #4004 from manqala/develop
Strip email ids in Contact before save
2017-08-28 16:02:24 +05:30
Brown-Harry Boma
38424c10c4 Strip email ids in Contact before save 2017-08-28 11:14:19 +01:00
Makarand Bauskar
93f9714194 codecy fixes 2017-08-28 15:40:42 +05:30
Rushabh Mehta
77cca859ec [fix] grid trigger issues 2017-08-28 15:13:58 +05:30
Manas Solanki
244e927a4e fix the test case 2017-08-28 13:03:01 +05:30
Manas Solanki
899fe860d1 sorted the select in permission manager as per translated string 2017-08-28 11:38:46 +05:30
system19
fc22c31ab0 Update lib fullcalendar.js and moment.js (#4000)
fullCalendar.js v3.0.1 to v3.4.0
fullCalendar.css v3.0.1 to v3.4.0
moment.js
version 2.14.1 to version 2.18.1
moment-timezone.js
version 0.5.4 to version 0.5.13
2017-08-28 11:20:07 +05:30
Rushabh Mehta
a6799f020f Merge pull request #3994 from manassolanki/remove-markup
remove the markup while exporting the reports in csv format
2017-08-24 18:41:51 +05:30
Rushabh Mehta
46e4f3b94d Merge pull request #3987 from KanchanChauhan/allow-add-to-desktop-for-single-doctype
Ability to add Single doctype to the desktop
2017-08-24 18:39:28 +05:30
Rushabh Mehta
f4b443537b Merge pull request #3996 from rohitwaghchaure/minor_issue_for_communication
[minor] frm.email_doc is not working for the page, if communication is blank
2017-08-24 18:36:21 +05:30
Rushabh Mehta
57e0adc238 Merge pull request #3985 from rmehta/control-autoname-prompt
[feature] autoname prompt, refactor control.js, fixes frappe/erpnext#8940
2017-08-24 18:35:52 +05:30
Rushabh Mehta
579a208060 [fix] controljs 2017-08-24 18:35:07 +05:30
Rushabh Mehta
b1edb7f797 [lint] 2017-08-24 18:35:07 +05:30
Rushabh Mehta
2ab07f4275 [feature] autoname prompt, refactor control.js, fixes frappe/erpnext#8940 2017-08-24 18:35:07 +05:30
Rushabh Mehta
9d51c42c7a Merge pull request #3984 from adityahase/install3
Python 3 compatibility fixes
2017-08-24 18:31:05 +05:30