Commit graph

12906 commits

Author SHA1 Message Date
Saurabh
0d5d786a3c [fix] merge-conflict 2017-07-03 18:37:59 +05:30
Saurabh
8d16ecfd31 Merge branch 'hotfix' 2017-07-03 18:35:03 +05:30
Saurabh
5036cafb98 bumped to version 8.2.5 2017-07-03 19:05:03 +06:00
rohitwaghchaure
e2d644803e [Fix] Activity page is not working (#3601)
* [Fix] Activity page is not working

* Update base_list.js
2017-07-03 18:29:01 +05:30
Saurabh
6f23f4fb06 Merge pull request #3602 from rmehta/standard-filters-fix-2
[fix] standard filters
2017-07-03 18:24:31 +05:30
Rushabh Mehta
fbf676e113 [fix] standard filters 2017-07-03 18:19:07 +05:30
Prateeksha Singh
afed0c9374 Setup wizard refactor (#3548)
* [wizard] refactor and UI cleanups

* [wip] attach image control cleanup

* try and detect lang, country, gravatar

* password control

* frappe.wiz to frappe.setup

* cleaned up slides, yet to decide on master data

* Add function to add dynamic fields in layout

* [fix] independent slide fields numbering by deep-cloning initial fields

* refresh only appended fields, autofill user_details

* [wizard] UI test

* [wizard] frappe icon, reuse get_geo_ip_country, cleanups
2017-07-03 18:15:40 +05:30
rohitwaghchaure
00613dbad4 Merge pull request #3600 from rohitwaghchaure/standard_reply_issue
[Fix] On selection standard reply, data not fetching in email message section
2017-07-03 17:46:53 +05:30
Rohit Waghchaure
1a47127089 [Fix] On selection standard reply, data not fetching in email body 2017-07-03 17:34:14 +05:30
Makarand Bauskar
1e31246241 Merge pull request #3597 from mbauskar/minor-fixes
[minor] return None is records are not available
2017-07-03 16:11:00 +05:30
mbauskar
389344489d [minor] return None is records are not available 2017-07-03 15:54:39 +05:30
Rushabh Mehta
43551ed537 [fix] test_authentication_log.py 2017-07-03 15:42:42 +05:30
Rushabh Mehta
2ee24ffc1d [tests] reset frappe.local.form_dict 2017-07-03 15:23:03 +05:30
Rushabh Mehta
eac06ccd77 [tests] reset frappe.local.form_dict 2017-07-03 14:31:41 +05:30
Rushabh Mehta
16ed88051e [tests] test_print_format.py test by printing 2017-07-03 14:19:41 +05:30
mbauskar
fe60f8e559 Merge branch 'hotfix' 2017-07-03 14:08:22 +05:30
mbauskar
6454281841 Merge branch 'master' into develop 2017-07-03 14:08:22 +05:30
mbauskar
89f0145748 bumped to version 8.2.4 2017-07-03 14:38:22 +06:00
Makarand Bauskar
c0a2e7c6c8 Merge pull request #3595 from rmehta/standard-filters-hot
[minor] dont render filters for no value fields
2017-07-03 13:58:23 +05:30
Rushabh Mehta
73523c2966 [tests] frappe.form_dict 2017-07-03 13:27:54 +05:30
Rushabh Mehta
e4ba84fe74 [minor] dont render filters for no value fields 2017-07-03 13:20:19 +05:30
Sagar Vora
d0306a7c26 [ci] remove incorrect docker sources from APT (#3587) 2017-07-03 12:33:33 +05:30
Britlog
242317c8d4 Breadcrumbs management (#3588) 2017-07-03 12:31:55 +05:30
Vishal Dhayagude
933782861d [fix]if fieldtype is table and come under first 4 mandtory field (#3594) 2017-07-03 12:31:06 +05:30
Saurabh
88c8df2350 [minor][fix] check for oauth1 access_key and access_secret before generating dropbox's oauth2 token (#3593) 2017-07-03 12:30:34 +05:30
rohitwaghchaure
7c9f2c7deb [enahnce] Fetch doctype's roles in report if developer mode is on or is standard is no (#3591)
* [enahnce] Fetch doctype's role in report if developer mode is on or is standard is no

* Update report.py

lets not keep separate rules for developer_mode! - this is not discoverable by a new developer
2017-07-03 12:29:49 +05:30
Manas Solanki
b7e1060ea7 removed the xlwt and use the openpyxl for sending the auto email report in xlsx format (#3590) 2017-07-03 12:27:34 +05:30
Ashwini Save
8ac396e30d Email configurable footer (#3584)
* Configurable footer for email template.

* Configurable footer: New table row for new line.

* Configurable footer: Updated space above footer text.
2017-07-03 12:25:54 +05:30
Alex Ford
78c03b90c3 lgtm minor fixes (#3580)
* Replace a typeof test against undefined with comparison against a string

* Add rel='noopener noreferrer' attributes to target='_blank' links

* Remove a duplicate object property definition

* Remove superfluous argument to function call

* Remove some variable declarations for which the assigned value is never read

* Remove an assignment to a variable that is never read
2017-07-03 12:25:07 +05:30
Vishal Dhayagude
fbce6b67be Redirect page (#3579)
* [fix]redirect to previous page

* Removed unused flag

* Update address.js
2017-07-03 12:21:49 +05:30
KanchanChauhan
2c3037a094 In currency if no value after decimal, default precion set to 2 (#3480)
* In currency if no value after decimal, default precion set to 2

* Update formatters.js
2017-07-03 12:10:53 +05:30
Makarand Bauskar
0df4949fcc Merge pull request #3583 from vishdha/contact_img_fix
Image in contact list view
2017-07-03 12:08:29 +05:30
Rushabh Mehta
f409fd7358 [ui-tests] python is back! (#3565)
* [ui-tests] python is back!

* [minor] remove old test

* [test] dont test test_runner

* [tests] try firefox

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome 1

* [tests] try chrome 2

* [tests] try chrome 3

* [tests] try phantomJS

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] try chrome

* [tests] login click button

* [tests] login click button

* [tests] show log

* [test] test with start_maximized

* [test] test only login

* [travis] test another port for selenium

* [travis] try running ui tests after unittests are done

* [travis] pring body_div if fails

* [tests] complete setup wizard for frappe

* [minor] move ui tests to frappe/ui/tests

* [tests] ui tests in public and codacy fixes

* [fix] tests + eslint

* [minor] move tests to tests/ui folder and print console after print

* [fix] linting

* [tests] added documentation and better integration testing

* [promise] form triggering is now promise based

* [test]

* [test]

* [test]

* [test]

* [test] print output

* [minor] default empty in select and print console

* [cleanup] more minor fixes

* [enhance] first-cut done!

* [minor] frappe.run_serially to pass arguments while chaining
2017-07-03 11:53:00 +05:30
mbauskar
b72dded0f7 Merge branch 'hotfix' 2017-06-30 11:58:13 +05:30
mbauskar
4488cd931a bumped to version 8.2.3 2017-06-30 12:28:13 +06:00
Makarand Bauskar
0ba69722b2 Merge pull request #3589 from saurabh6790/filter_fixes
[hot][fix] set field type
2017-06-30 11:55:55 +05:30
Saurabh
17e9315f3c [hot][fix] set field type 2017-06-30 11:52:39 +05:30
mbauskar
2111cbd578 Merge branch 'develop' 2017-06-29 17:00:53 +05:30
mbauskar
fc5aeba904 bumped to version 8.2.2 2017-06-29 17:30:53 +06:00
Makarand Bauskar
8ff36f0161 Merge pull request #3586 from mbauskar/filters-fixes
[minor] fixes in clear-filters
2017-06-29 16:59:13 +05:30
mbauskar
40d91fb870 [minor] fixes in clear-filters 2017-06-29 16:58:37 +05:30
mbauskar
3e4bbce256 Merge branch 'develop' 2017-06-29 16:33:34 +05:30
mbauskar
a638d1b040 bumped to version 8.2.1 2017-06-29 17:03:33 +06:00
Makarand Bauskar
ed7dad8999 Merge pull request #3585 from mbauskar/filters-fixes
[fixes] fixes in standard filters
2017-06-29 16:32:30 +05:30
mbauskar
7cfa3b690b [fixes] fixes in standard filters 2017-06-29 16:23:30 +05:30
mbauskar
4d0c41ec14 Merge branch 'develop' 2017-06-29 15:05:28 +05:30
mbauskar
76a5a5e408 bumped to version 8.2.0 2017-06-29 15:35:28 +06:00
Makarand Bauskar
56a2719d97 Update patches.txt 2017-06-29 15:04:16 +05:30
Vishal
766e67b615 Image in contact list view 2017-06-29 15:02:18 +05:30
Saurabh
986ff8e1a5 Merge pull request #3582 from mbauskar/patch
[minor] enabled allow error traceback ins system settings
2017-06-29 15:02:04 +05:30