Commit graph

21610 commits

Author SHA1 Message Date
Faris Ansari
66bd2a9f5e
chore: Squash PRs when squash label is added (#8446) 2019-09-18 12:29:50 +05:30
mergify[bot]
12f602cc8a
Merge pull request #8444 from ruchamahabal/export_report_fix
fix(report-view): show export all checkbox only if total row count ex…
2019-09-18 06:47:13 +00:00
Rucha Mahabal
e6055d406e fix: codacy 2019-09-18 11:56:16 +05:30
Rucha Mahabal
3de3ce0230 fix(report-view): show export all checkbox only if total row count exceeds page length 2019-09-17 22:23:24 +05:30
mergify[bot]
2777380fce
Merge pull request #8438 from scmmishra/list-more-fix
fix: more button visibility in webforms
2019-09-17 11:49:11 +00:00
Sahil Khan
7d82c1fbcf Merge branch 'develop' into version-12 2019-09-17 17:09:52 +05:30
Sahil Khan
ff8eefa355 bumped to version 12.0.13 2019-09-17 17:29:52 +05:50
mergify[bot]
54cc0e9ba3
Merge pull request #8441 from surajshetty3416/fix-mapper-permission
fix: Move permission check code in get_mapped_doc method
2019-09-17 11:25:13 +00:00
Frappe PR Bot
88e9d81fb9 feat: Updated translation (#8430) 2019-09-17 15:58:09 +05:30
Suraj Shetty
757953851b fix: Move permission check code in get_mapped_doc method
- Check target_doc creation permission only after
completely mapping target doc with source_doc
2019-09-17 15:47:49 +05:30
Shivam Mishra
d1c4e6e7dd fix: more button visibility in webforms 2019-09-17 11:51:00 +05:30
Himanshu
4dcd4d3a21 chore: remove code related to gcalendar (#8425) 2019-09-16 21:51:42 +05:30
Shivam Mishra
755721d01b fix: ignore permission for reopening assignments (#8432) 2019-09-16 21:50:40 +05:30
mergify[bot]
341fcd9975
Merge pull request #8429 from scmmishra/asssignment-rule-fix
fix: assignments reflect after removing on sidebar
2019-09-16 10:48:25 +00:00
Shivam Mishra
becedb64a3 fix: assignments reflect after removing on sidebar 2019-09-16 15:58:24 +05:30
mergify[bot]
bde6d31dec
Merge pull request #8423 from hrwX/addr_query
feat(Contact): Show address related to doctype in child
2019-09-16 09:38:43 +00:00
mergify[bot]
824a3ab33a
Merge pull request #8428 from scmmishra/asssignment-rule-fix
fix: added null check for conditions
2019-09-16 08:32:24 +00:00
Shivam Mishra
124a218bbf fix: added null check for conditions 2019-09-16 13:24:16 +05:30
Nabin Hait
4668cc64e0 fix: reload google contacts 2019-09-16 12:49:03 +05:30
Himanshu
25979febb6 fix: v11 patch breaking as v11 dint have gcontacts (#8426) 2019-09-16 12:02:06 +05:30
Himanshu Warekar
7a25c26390 fix: check for read permission 2019-09-16 10:02:43 +05:30
Himanshu Warekar
ccd2c10128 chore: remove log statement 2019-09-15 17:46:53 +05:30
Himanshu Warekar
3dbafe4bd9 feat: show address related to doctype in child 2019-09-15 15:06:02 +05:30
Faris Ansari
f26c8895bd
feat: API to scan and get barcode from camera (#8415)
* feat: API to scan and get barcode from camera

- frappe.barcode.scan_barcode

* fix: Use cordova barcodeScanner in mobile app

* style: Undefined variable and no console
2019-09-14 15:14:03 +05:30
mergify[bot]
aec9ca891a
Merge pull request #8419 from scmmishra/search-allow-guest
refactor: convert link field to autocomplete
2019-09-13 12:27:30 +00:00
Shivam Mishra
582d74c31b refactor: remove allow guest from search 2019-09-13 17:40:18 +05:30
Shivam Mishra
642896fc9a feat: convert link to autocomplete 2019-09-13 17:39:33 +05:30
Anurag Mishra
a250e99377
refactor: assignment rule and todo (#8420)
* refactor: assignment rule and todo

* fix: updated query and enabled background jobs

* refactor: use ORM instead of SQL

* style: remove print statement

* refactor: minor change in tests

* style: updated query for getting todo
2019-09-13 17:13:05 +05:30
mergify[bot]
0a46aa2fa4
Merge pull request #8359 from hrwX/google_cont
feat(Integrations): Google Contacts
2019-09-13 11:16:09 +00:00
Himanshu
8dd559b9e5
Update frappe/integrations/doctype/google_contacts/google_contacts.py
Co-Authored-By: Faris Ansari <netchampfaris@users.noreply.github.com>
2019-09-13 16:07:31 +05:30
Himanshu Warekar
9366334fbd fix: auto fetch google contact 2019-09-13 15:53:41 +05:30
mergify[bot]
8be8abd04b
Merge pull request #8402 from rohitwaghchaure/fixed_strip_checkout_page_css_not_working
fix: Stripe checkout page not showing options correctly
2019-09-13 09:56:54 +00:00
Faris Ansari
efa87c6a37
fix: Use Bootstrap 4 class names 2019-09-13 15:14:04 +05:30
Shivam Mishra
6a970dec4d refactor: allow guests access to search link 2019-09-13 13:09:34 +05:30
mergify[bot]
5bf4ec3b8c
Merge pull request #8398 from netchampfaris/duplicate-file-on-disk
fix: Check if duplicate file exists on disk
2019-09-13 07:27:36 +00:00
mergify[bot]
e5982588f6
Merge pull request #8413 from deepeshgarg007/scheduler_fix
fix: Do not show scheduler inactive popup in developer mode
2019-09-13 07:17:11 +00:00
Faris Ansari
e2bc9c479f
fix(translations): Extract messages from .vue files (#8403) 2019-09-13 12:42:04 +05:30
Faris Ansari
001a78d079
fix: Simpler check 2019-09-13 12:36:39 +05:30
deepeshgarg007
b8f0ac03ea fix: Do not show scheduler inactive popup in developer mode 2019-09-13 11:24:53 +05:30
mergify[bot]
5a5886405e
Merge pull request #8407 from nabinhait/invalid-fieldname-dev
fix: Validate invalid fieldnames
2019-09-12 19:51:21 +00:00
Himanshu Warekar
737fb3f9b1 fix: set google contact account while fetching 2019-09-12 23:26:52 +05:30
Faris Ansari
ee5298a00a
fix: Better Message 2019-09-12 23:09:07 +05:30
deepeshgarg007
f7d3340bb9 fix: Do not show scheduler inactive popup in developer mode 2019-09-12 22:03:47 +05:30
mergify[bot]
b231020611
Merge pull request #8409 from deepeshgarg007/nested_set
fix: Is tree check in nested set
2019-09-12 16:23:13 +00:00
sahil28297
00e694066e
Merge pull request #8411 from surajshetty3416/fix-custom-field-migration
fix: Skip get_table_fields of Custom Field if field_doctype is Custom Field
2019-09-12 20:52:01 +05:30
Suraj Shetty
139da25574 fix: Skip get_table_fields of Custom Field
-  if field_doctype is Custom Field
2019-09-12 19:29:12 +05:30
Suraj Shetty
4fc77a4119 Merge branch 'develop' of https://github.com/frappe/frappe into develop 2019-09-12 19:27:18 +05:30
deepeshgarg007
56e6d4038c fix: Is tree check in nested set 2019-09-12 18:45:38 +05:30
Sahil Khan
64349d9254 feat(custom_field): add length option in custom field 2019-09-12 18:37:26 +05:30
Sahil Khan
a5480c8dfc feat(custom_field): update db on updating custom field 2019-09-12 18:37:13 +05:30