Commit graph

19825 commits

Author SHA1 Message Date
Michael Oshosanya
5e97e04000 Resolve conversation 2019-04-23 06:41:33 +01:00
Rushabh Mehta
e420b2e751
Merge pull request #7333 from adityahase/feat-touched-tables
feat: Maintain list of tables touched during migrate
2019-04-23 10:51:18 +05:30
Aditya Hase
c29fcb02d6 feat: Maintain list of tables touched during migrate
This can be used to selectively restore changed tables from backup
after migrate failure
2019-04-23 10:31:44 +05:30
Suraj Shetty
565bc8789d
Merge pull request #7338 from frappe/fix-grid-upload
fix: Remove unwanted frappe.upload.get_strting in grid.js
2019-04-23 09:47:14 +05:30
Suraj Shetty
bfde3835c4 fix: Decode file data to string 2019-04-23 09:43:48 +05:30
Suraj Shetty
79d5c9cf52 fix: Remove frappe.upload.get_strting 2019-04-23 09:24:42 +05:30
Rushabh Mehta
c35ad8887f fix: remove console.log 2019-04-23 08:30:55 +05:30
Rushabh Mehta
6af03aa129 fix(style): cleaner style for form sidebar and other minor cleanups 2019-04-23 08:28:32 +05:30
Suraj Shetty
c800d51716
Merge pull request #7336 from frappe/fix-review-section
fix: Review section
2019-04-23 00:20:06 +05:30
Suraj Shetty
3d1f12d8c0 fix: Replace single quotes with double 2019-04-22 22:47:12 +05:30
Suraj Shetty
d743485218 fix: Remove review section from attachments
- Make separate section for review
2019-04-22 22:43:31 +05:30
Suraj Shetty
7ed02cd103 fix: Remove extra call for review points of form load 2019-04-22 22:33:59 +05:30
rohitwaghchaure
09f5102884 fix: Prepared report shows status as Queued even if job is failed (#7331) 2019-04-22 17:32:52 +05:30
Mangesh-Khairnar
2d2556f502 style: change permissions format 2019-04-22 16:49:15 +05:30
Rushabh Mehta
21fc58a198 fix(milestone_tracker): doctype ui 2019-04-22 16:17:56 +05:30
rohitwaghchaure
0800b521ff fix: moved erpnext related methods from frappe to erpnext (#7332) 2019-04-22 15:56:30 +05:30
Suraj Shetty
aea23d9dbc
Merge pull request #7329 from prasadarr/develop-linkfixes
fix: broken YouTube link for user help
2019-04-22 14:07:15 +05:30
Mangesh-Khairnar
c23876198d fix: filter default docs from allowed docs 2019-04-22 13:54:05 +05:30
Mangesh-Khairnar
8d8ef7ad3c fix: return allowed docs along with default doc 2019-04-22 13:53:43 +05:30
Prasad Ramesh
de9e87f206
fix broken YouTube link for user help 2019-04-22 13:07:25 +05:30
Suraj Shetty
5fc1173356
Merge pull request #7328 from netchampfaris/fix-file-upload-data-url
fix: Grid Upload
2019-04-22 12:43:20 +05:30
Michael Oshosanya
89a80908a1 Resolve conversation 2019-04-22 08:02:57 +01:00
Faris Ansari
4b37818857 fix: Grid Upload 2019-04-22 11:45:40 +05:30
Anurag Mishra
b56830e2e5 fix: Cannot delete Issue because it is linked to Comments(v12) (#7270)
* fix: Cannot delete Issue because it is linked to Comments

* fix: commonified code
2019-04-22 11:27:58 +05:30
Rushabh Mehta
01242afc8f
Merge pull request #7304 from rmehta/milestone-tracker
feat: Milestone Tracker. Track document lifecycle with milestones
2019-04-22 11:08:49 +05:30
Rushabh Mehta
7391ef00c3
Merge pull request #7323 from rmehta/grid-move-row
feat(grid): Move row to a particular id
2019-04-22 11:08:28 +05:30
Suraj Shetty
943552de6a
Merge pull request #7294 from netchampfaris/show-hidden-fields-report-builder-d
fix: Show Hidden fields in Report Builder
2019-04-22 10:31:57 +05:30
Rushabh Mehta
425d6c4592
Merge pull request #7297 from netchampfaris/feat-full-width-container
feat: Full Width Container
2019-04-22 09:04:30 +05:30
Rushabh Mehta
c779ec93f6 fix(linting) 2019-04-22 08:59:13 +05:30
Michael Oshosanya
a0f8d3f21c Allow user to specify database port 2019-04-21 19:43:49 +01:00
Deepesh Garg
63508953f2
Merge pull request #7325 from deepeshgarg007/custom-link-develop
fix(query_report): Link field fixes for custom reports
2019-04-21 22:31:19 +05:30
deepeshgarg007
19a6b6fbcb fix: Link field fixes for custom reports 2019-04-21 22:09:59 +05:30
Rushabh Mehta
ac721a6f34 feat(grid): Move row to a particular id 2019-04-21 21:06:06 +05:30
Shivam Mishra
6f6270d2c4
Merge pull request #7320 from netchampfaris/remove-frappe-upload-make
refactor: Remove frappe.upload.make
2019-04-21 19:25:13 +05:30
Deepesh Garg
dd3d60a961
Merge pull request #7301 from surajshetty3416/fix-auto-assignment
fix: Change fieldtype of assign_condition from "Small Text" to "Code"
2019-04-20 20:24:40 +05:30
Rushabh Mehta
0f1d8c7622 fix(for-patch): cache manager to ignore missing tables 2019-04-20 16:48:30 +05:30
Rushabh Mehta
ce5e0b6453
Merge pull request #7313 from netchampfaris/dynamic-filters-auto-email
feat: Dynamic Date filters in Auto Email Report
2019-04-20 14:33:30 +05:30
Suraj Shetty
3d21bba74d test: fix fill_field command for code fieldtype 2019-04-20 14:01:19 +05:30
Faris Ansari
582863e5bb fix: Revert backslash in templates 2019-04-20 13:30:13 +05:30
Faris Ansari
cd3f8b0b7e
fix(QueryReport): Expand/Collapse all for tree (#7214) 2019-04-20 13:15:16 +05:30
Faris Ansari
beb2727bb3
fix: Print Format UX (#7284)
- Rename type Server and Client to Jinja
- Rename Js to JS
- Patch
- Reload Print Format when new one is created
- Missing Semicolon and sanity check
2019-04-20 13:09:02 +05:30
Suraj Shetty
70eb99a5a4 Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment 2019-04-20 12:12:37 +05:30
Faris Ansari
b465102a43
Merge branch 'develop' into feat-full-width-container 2019-04-20 11:54:25 +05:30
Faris Ansari
51d0607977
fix: Re-enable cypress test recording (#7319) 2019-04-20 11:45:55 +05:30
Faris Ansari
8cb95d1b84 refactor: Remove frappe.upload.make 2019-04-19 15:49:26 +05:30
Faris Ansari
9743c50419 fix: Remove unused import 2019-04-19 15:46:30 +05:30
Faris Ansari
43ce786071 style: Method could be a function 2019-04-19 15:46:14 +05:30
Faris Ansari
3c35903728 Merge branch 'feat-full-width-container' of https://github.com/netchampfaris/frappe into feat-full-width-container 2019-04-19 15:26:41 +05:30
Faris Ansari
6ffc47f1e6 Merge branch 'develop' of https://github.com/frappe/frappe into feat-full-width-container 2019-04-19 15:25:45 +05:30
Faris Ansari
8146b662ac test: Dynamic Dates in Auto Email Report 2019-04-19 15:06:33 +05:30