Commit graph

13576 commits

Author SHA1 Message Date
pratu16x7
91c2e57fdb [setup wiz] fixes 2017-08-29 10:03:06 +05:30
pratu16x7
81d2edf0df Mark as done and progress updates 2017-08-29 10:03:05 +05:30
pratu16x7
2a0901af02 [user-progress] slide action cards 2017-08-29 10:03:05 +05:30
pratu16x7
df55d9b9b9 [user-progress] make next button primary 2017-08-29 10:03:05 +05:30
pratu16x7
e847ffce30 [user-progress] cleanup 2017-08-29 10:03:05 +05:30
pratu16x7
674308958a [setup-wiz] UI test command 2017-08-29 10:03:04 +05:30
pratu16x7
89aff93a5e [setup-wiz] fix setup complete state 2017-08-29 10:03:04 +05:30
pratu16x7
c17bf0a04d [slides] setup wizard refactor 2017-08-29 10:03:04 +05:30
pratu16x7
b64f31e617 [slides] fix primary button 2017-08-29 10:03:04 +05:30
pratu16x7
af169b6e4b [slides][wip] setup wizard slide container 2017-08-29 10:03:03 +05:30
pratu16x7
347cd50db8 [slides] container controls slides 2017-08-29 10:03:03 +05:30
pratu16x7
6527a17251 [user-progress] Slides as container object, dismiss button 2017-08-29 10:03:03 +05:30
pratu16x7
5f988c3d7b [user-progress] first cut 2017-08-29 10:03:03 +05:30
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
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
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
Rushabh Mehta
fdb8e7d7b3 Merge pull request #3976 from rmehta/domain-restrict-fix
[fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235
2017-08-24 18:30:40 +05:30
Kanchan Chauhan
7657143221 Ability to add Single doctype to the desktop 2017-08-24 17:56:55 +05:30
Rohit Waghchaure
7a7188009e [minor] frm.email_doc is not working for the page, if communication is blank 2017-08-24 17:28:58 +05:30
Rushabh Mehta
013f0bf001 Merge branch 'hotfix' 2017-08-24 16:51:27 +05:30
Rushabh Mehta
2377434d39 Merge branch 'master' into develop 2017-08-24 16:51:27 +05:30
Rushabh Mehta
5882e5bc66 bumped to version 8.8.4 2017-08-24 17:21:27 +06:00
Rushabh Mehta
b6a17de4a9 Merge pull request #3993 from rmehta/file-delete-message
[fix] show better message for permission to delete file
2017-08-24 16:50:47 +05:30
Rushabh Mehta
a8773a5570 Merge pull request #3991 from rmehta/import-xls-fix
[fix] importer.py, allow for truncated rows due to xls import
2017-08-24 16:49:34 +05:30
Manas Solanki
48e7d5d87e remove the markup while exporting the reports in csv format 2017-08-24 16:36:56 +05:30
Aditya Hase
a816dcfe0f Use explicit relative import while importing install_fixtures 2017-08-24 16:34:44 +05:30
Aditya Hase
cfc97ba3b6 Convert filter to list before checking length 2017-08-24 16:34:44 +05:30
Rushabh Mehta
e8c7b046ee [fix] show better message for permission to delete file 2017-08-24 16:21:39 +05:30
Rushabh Mehta
edd853c509 Merge pull request #3989 from netchampfaris/hotfix
[Fix] Desk assets for mobile
2017-08-24 16:08:16 +05:30
Rushabh Mehta
3404445719 Merge pull request #3992 from ashwinisave35/help_aricle_button
Added data attribute data-communication-type to filter "Help Article" Button for communication type "Comment"
2017-08-24 16:08:02 +05:30
Rushabh Mehta
16129ce785 [fix] catch error in data import 2017-08-24 16:05:47 +05:30
Rushabh Mehta
4e456b4e42 [fix] importer.py, allow for truncated rows due to xls import 2017-08-24 15:49:47 +05:30
Ashwini Save
1b3e48cc1e Added data attribte data-communication-type to filter "Help Article" button for Comment. 2017-08-24 15:03:22 +05:30
Faris Ansari
598930fca9 [fix] desk assets for mobile 2017-08-24 14:26:53 +05:30
Rushabh Mehta
09596f1d32 [minor] bench request 2017-08-24 13:48:08 +05:30