Shivam Mishra
2fccdd5bd2
fix: resolve conflicts in standard.json
2020-04-21 13:34:00 +05:30
Shivam Mishra
ceabdf7403
feat: better handling of website tracking flag
2020-04-21 12:43:26 +05:30
Shivam Mishra
d265f00f9b
fix: update timestamp
2020-04-21 12:38:04 +05:30
Shivam Mishra
ba03e6ee5d
fix: conflict
2020-04-20 16:36:52 +05:30
Shivam Mishra
00cb903462
feat: remove unused import
2020-04-17 15:47:56 +05:30
Shivam Mishra
7e0e6630bd
feat: add user timezone and unique visit check
2020-04-17 13:00:48 +05:30
Shivam Mishra
0bc153704c
style: linting & formatting fixes
2020-04-16 18:30:42 +05:30
Shivam Mishra
33c6089049
feat: rename doctype to Web Page View
2020-04-16 18:25:36 +05:30
Shivam Mishra
985392d07f
fix: linting fixes
2020-04-16 11:32:58 +05:30
Shivam Mishra
d08382affa
Merge branch 'develop' of github.com:frappe/frappe into tracking
2020-04-16 11:24:30 +05:30
Rushabh Mehta
141a7241b0
Merge pull request #9958 from rmehta/web-view
...
feat(Web View): Create Web Views
2020-04-16 11:07:03 +05:30
Suraj Shetty
038982752b
Merge pull request #9945 from frappe/mergify/bp/develop/pr-9904
...
fix: allow allow_on_submit to be set in customize form (bp #9904 )
2020-04-16 11:03:17 +05:30
Rushabh Mehta
ddb3c660aa
fix(test): test_web_view.py for Python 2.7 added classmethod decorator
2020-04-16 10:21:44 +05:30
Anupam Kumar
8a2c85c687
feat: Add new report column property disable_total ( #9909 )
...
* Adding new column property disable_total
* Sider fix
* Sider fix
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-16 04:46:35 +00:00
Rushabh Mehta
7800fdbfee
fix(tests): sitemap and condition field for Web View
2020-04-16 09:38:34 +05:30
Rushabh Mehta
ee6903523b
fix(test): Theme tests does not run on Travis
2020-04-16 01:20:54 +05:30
Rushabh Mehta
a7c7df3cc4
fix(tests): Added tests for Web View, Website Theme
2020-04-16 01:03:18 +05:30
Shivam Mishra
7a9a16b6af
feat: add page view count to form
2020-04-16 00:03:17 +05:30
Shivam Mishra
815f05a0eb
feat: added enable tracking flag to default website context
2020-04-16 00:02:56 +05:30
Shivam Mishra
6233e94dab
feat: added utility to get browser details
2020-04-16 00:02:27 +05:30
Shivam Mishra
9ad1cf94f2
feat: add tracking enabled info to boot
2020-04-16 00:01:55 +05:30
Shivam Mishra
3d45460749
feat: added tracking script to website
2020-04-16 00:01:38 +05:30
Shivam Mishra
bc042b37b7
feat: added Page View doctype
2020-04-16 00:01:27 +05:30
Rushabh Mehta
1f896705d3
fix(cleanup): remove weblist
2020-04-15 23:19:20 +05:30
Rushabh Mehta
ac6391f429
feat(Web List): wip
2020-04-15 23:16:55 +05:30
Rushabh Mehta
6b5a47c599
fix: minor bug fixes
2020-04-15 23:14:38 +05:30
Rushabh Mehta
0322ab198d
feat: make Web View embeddable and allow navbar and footer as Web Views
2020-04-15 23:14:38 +05:30
Rushabh Mehta
e323441c15
feat: Add Web View to compose webpages with components
2020-04-15 23:12:57 +05:30
Prssanna Desai
a5daf8ffa1
fix: check if field is a default field before getting df ( #9953 )
2020-04-15 19:34:12 +05:30
mergify[bot]
4fb9717074
Merge pull request #9947 from rohitwaghchaure/fixed_dont_disaply_mandatory_property_to_specific_fieldtype
...
fix: hide mandatory property for html, section / column break, button…
2020-04-15 04:30:06 +00:00
Rohit Waghchaure
35398e8879
fix: hide mandatory property for html, section / column break, button fieldtype
2020-04-15 02:30:25 +05:30
mergify[bot]
2c03ecb8fb
Merge pull request #9883 from Alchez/dev-chat-notification
...
fix: notification improvements to Chat (develop)
2020-04-14 13:54:04 +00:00
prssanna
a9a7474bec
fix: allow allow_on_submit to be set in customize form if docfield value is set
...
(cherry picked from commit 57a3463cde4ee29dcdfac8daa664025fe3dd3662)
2020-04-14 11:55:31 +00:00
mergify[bot]
aef809d67a
Merge pull request #9923 from gavindsouza/dirty-form
...
feat: don't save document if not updated
2020-04-14 09:42:20 +00:00
mergify[bot]
18be5ffb8d
Merge pull request #9938 from hrwX/remove_hidden_fields_report
...
fix(Report Builder): do not show hidden field in report builder
2020-04-14 08:09:27 +00:00
Himanshu
80f27f6081
fix: remove Customer & Supplier to hooks ( #9874 )
2020-04-14 13:01:49 +05:30
mergify[bot]
70c3a27b5c
Merge pull request #9933 from scmmishra/separate-custom
...
refactor: separate custom doctypes and reports
2020-04-14 06:55:16 +00:00
Himanshu Warekar
e7dcce45e6
fix: do not show hidden field in report builder
2020-04-14 12:21:06 +05:30
rohitwaghchaure
796d94cc6d
fix: minor ( #9927 )
2020-04-13 14:41:11 +00:00
mergify[bot]
8b23bcdf07
Merge pull request #9926 from surajshetty3416/fix-private-file-access
...
fix: No access for private files by default
2020-04-13 14:19:03 +00:00
Shivam Mishra
8a85c2fe02
refactor: separate custom doctypes and reports
2020-04-13 18:53:18 +05:30
ci2014
e57f005622
fix: frappe.utils in get_context ( #9844 )
...
* Remove point from frappe.utils in get_context
For example frappe.utils.data.today() does not work. If we change it and use frappeutils.data.today() it works. This has to do with Jinja. Any better ideas?
* fix: frappe.utils in context
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-13 12:30:44 +00:00
mergify[bot]
4c991db68f
Merge pull request #9862 from scmmishra/awesomebar-fix
...
feat: Access awesomebar from desk
2020-04-13 12:01:49 +00:00
Suraj Shetty
310f32175b
fix: Allow private files if owner is accessing
2020-04-13 17:07:38 +05:30
mergify[bot]
82a6715cb3
Merge pull request #9851 from fumin/patch-1
...
fix: web form not submitting data in grid views
2020-04-13 11:23:54 +00:00
mergify[bot]
9258d6aa53
Merge pull request #9914 from scmmishra/desk-custom-nonetype-fix
...
feat: handle empty config
2020-04-13 11:11:02 +00:00
mergify[bot]
bcef06840e
Merge pull request #9766 from prssanna/field-strip-html
...
fix: Strip html for required field types
2020-04-13 10:58:44 +00:00
mergify[bot]
95e0280f7b
Merge pull request #9925 from Thunderbottom/rename_doc-fix
...
fix: pop cmd from rename_doc
2020-04-13 10:46:37 +00:00
Suraj Shetty
c188de8947
fix: No access for private files by default
2020-04-13 16:10:34 +05:30
mergify[bot]
5baa07db57
Merge pull request #9913 from kasgel/kasgel/frappe-request-cmd-header
...
feat: Add frappe cmd to request headers on website for analytics purposes
2020-04-13 09:40:39 +00:00
