Commit graph

19700 commits

Author SHA1 Message Date
rohitwaghchaure
174c2be99f
Merge pull request #7576 from rohitwaghchaure/pagination_in_the_multi_select_modal_develop
feat: added more button in the multi select modal
2019-05-29 11:12:59 +05:30
Suraj Shetty
736d4db135 fix: Use different class for link preview popover (#7582)
* fix: Add different class for link preview popover
- Because the style changes for it used to affect other popovers

* fix: Re-arrange popover style for proper style override
2019-05-29 10:47:22 +05:30
Suraj Shetty
704b091c4c fix: Add a patch to apply customization to custom doctype (#7546)
This patch aims to apply & delete all the customization
on custom doctypes done through customize form

This is required because customize form in now blocked
for custom doctypes and user may not be able to
see previous customization
2019-05-29 10:15:10 +05:30
Saurabh
f3471fe5f9 fix: Handle file not found exception while extracting messages (#7574) 2019-05-29 10:12:39 +05:30
Suraj Shetty
5af58d429c fix(energy point): Negative values for review point in leaderboard (#7577)
* fix: Show available review points

* style: Simplify formatting
2019-05-29 10:09:40 +05:30
Deepesh Garg
2ae48532be fix: Update frappe-datatable (#7580) 2019-05-29 10:07:23 +05:30
Rohit Waghchaure
fa799d5734 fix: same result set shwoing multiple times in the multi-select popup 2019-05-28 23:40:30 +05:30
Rohit Waghchaure
7788b807e0 feat: added more button in the multi select modal 2019-05-28 20:53:15 +05:30
Mangesh-Khairnar
f75aa3beff fix: add rating field in docfield (#7571) 2019-05-28 14:21:20 +05:30
Rushabh Mehta
6542d74578
Merge pull request #7564 from surajshetty3416/minimizable-dialog
feat(dialog): Option to minimize dialog
2019-05-28 12:38:10 +05:30
Rushabh Mehta
7e42520554 fix(minor): frappe.conf.db_type in sql exception 2019-05-28 12:29:39 +05:30
Saurabh
5826e934bf
Merge pull request #7566 from netchampfaris/website-fix-for-custom-doctype-d
fix: Skip website attr for Custom DocTypes
2019-05-28 12:18:57 +05:30
Saurabh
67e7af4bc5
Merge pull request #7558 from Alchez/develop-route-history-issue
fix: Fix routing issue causing dynamic links to disappear
2019-05-28 12:04:09 +05:30
Saurabh
605e024fda
Merge pull request #7568 from surajshetty3416/eps-ux
fix(energy points): Show name of the user who actually reverted points
2019-05-28 11:24:17 +05:30
Suraj Shetty
3a5288c661 fix: Show name of the user who actually reverted points 2019-05-28 08:20:22 +05:30
Faris Ansari
2c5b5ba45a fix: Skip website attr for Custom DocTypes 2019-05-27 18:40:11 +05:30
Rushabh Mehta
2e2c72629e fix(minor): communication.js remove old style print 2019-05-27 16:00:57 +05:30
Suraj Shetty
1907e8ad7e fix: Modal z-index 2019-05-27 14:44:51 +05:30
Himanshu
cf2de1fa20 fix(patch): Reload Communication Link (#7555)
* fix: reload comm_link

* Update patches.txt
2019-05-27 13:44:12 +05:30
Suraj Shetty
bbbb99f4d6 style: fix formatting 2019-05-26 20:35:26 +05:30
Rushabh Mehta
bfb149180c fix(minor): model.js 2019-05-26 17:52:55 +05:30
Himanshu
73c6520aef fix: Remove update_timeline_links from document.py (#7563) 2019-05-26 15:37:10 +05:30
Suraj Shetty
ac9b0d3397 Merge branch 'develop' of https://github.com/frappe/frappe into minimizable-dialog 2019-05-26 11:07:46 +05:30
Suraj Shetty
f54c6aeb1a fix: Dialog style 2019-05-26 11:07:35 +05:30
rohitwaghchaure
a06b821602
Merge pull request #7560 from rohitwaghchaure/incorrect_schedule_in_the_auto_repeat_develop
fix: incorrect schedule showing in the auto repeat when document is in the draft mode
2019-05-25 14:11:56 +05:30
Faris Ansari
e9b0c2229d fix: Error message for invalid Workflow Transition (#7553)
When you import a document of a DocType which has a workflow, you
shouldn't be able to set the workflow_state to a state except the first.
This patch shows a better error message.
2019-05-25 11:56:20 +05:30
Rohit Waghchaure
30c401deee fix: incorrect schedule showing in the draft mode 2019-05-24 18:51:19 +05:30
Deepesh Garg
e6b8b1de0b fix: Refresh report again if route options are passed (#7557) 2019-05-24 18:03:03 +05:30
Felipe Orellana
3c351a2a51 fix: Fixes route rewrite issue causing dynamic links on addresses to disapear 2019-05-24 15:56:54 +05:30
Rushabh Mehta
f239c885f2 fix(print.js): refactor for new form.js 2019-05-24 12:29:05 +05:30
Rushabh Mehta
6d32946f64 fix(minor): removed debug 2019-05-24 12:08:22 +05:30
Rushabh Mehta
17c43b4e1d fix(db_type) 2019-05-24 12:06:39 +05:30
Rushabh Mehta
1c893e44c0 fix: frappe.conf.db_type -> frappe.db.db_type 2019-05-24 11:44:28 +05:30
Rushabh Mehta
4c03f8b31c
Merge pull request #7537 from rmehta/yeah-form-js
BREAKING CHANGE: refactor form.js and remove deprecated API
2019-05-24 11:35:48 +05:30
Rushabh Mehta
7135c0d9e8 fix(various): after manual testing 2019-05-24 11:22:09 +05:30
Rushabh Mehta
adda5c3f6c fix(merge): merge latest changes 2019-05-24 09:10:33 +05:30
Rushabh Mehta
2ef6af8244 fix(minor): added frappe.db.db_type 2019-05-24 09:09:46 +05:30
Rushabh Mehta
d92606cea9 fix(sessions): handle separate ways of session expiry in postgres and mariadb 2019-05-24 09:09:46 +05:30
Rushabh Mehta
7107f335f2 fix(session): session expiry not querying correctly 2019-05-24 09:08:56 +05:30
Rushabh Mehta
0a14554a15 fix(session): session expiry not querying correctly 2019-05-24 09:08:56 +05:30
Rushabh Mehta
48775f55fa fix(linting) 2019-05-24 09:08:56 +05:30
Rushabh Mehta
9f5a632baf fix(linting) 2019-05-24 09:08:56 +05:30
Rushabh Mehta
81fa64d4bc refactor(form.js): remove very old API 2019-05-24 09:08:56 +05:30
Rushabh Mehta
83eb9c3acc refactor(form.js): wip 2019-05-24 09:08:56 +05:30
Rushabh Mehta
bedaa5453f refactor(form.js): the time has come 2019-05-24 09:08:20 +05:30
Anurag Mishra
dacdd3fdb5 fix: Bulk user permission unhandled condition(v12) (#7401)
* fix: unhandled condition

* test: for update from apply_to_all to apply_to_all

* fix: refractor

* Update test_user_permission.py
2019-05-24 08:36:41 +05:30
Rushabh Mehta
8e9336b476
Merge pull request #7545 from deepeshgarg007/datatable
fix: Update frappe datatable
2019-05-23 17:33:38 +05:30
Rushabh Mehta
fa814824f8
Merge pull request #7501 from netchampfaris/form-attachments
fix: Upload form attachments to Attachments folder
2019-05-23 17:32:55 +05:30
Faris Ansari
99c624bd9c
Merge branch 'develop' into form-attachments 2019-05-23 15:21:11 +05:30
deepeshgarg007
6b4c24fda6 Merge branch 'develop' of https://github.com/frappe/frappe into datatable 2019-05-23 15:16:56 +05:30