vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
20425 commits 1 branch 0 tags 587 MiB
Commit graph

20425 commits

This branch
This branch
All branches
Author SHA1 Message Date
deepeshgarg007
dfd9fbe3b8 fix: Include controle.min.js for both list view and formview 2019-07-09 16:42:49 +05:30
mergify[bot]
0b0bbff3ab
Merge pull request #7843 from surajshetty3416/revert-cancelled-doc-points 
feat: Auto revert points on the doc if the doc gets canceled
 2019-07-07 09:55:36 +00:00
mergify[bot]
3422938d16
Merge pull request #7851 from deepeshgarg007/datatable-develop-1.13.5 
fix: Upgrade frappe datatable
 2019-07-07 09:53:32 +00:00
deepeshgarg007
63b713bf09 fix: Upgrade datatable 2019-07-07 14:10:45 +05:30
Faris Ansari
2f7b7b02ac
fix: Retain list_context object (#7848) 
list_context object was lost between update_context_from_module calls
 2019-07-06 13:40:02 +05:30
mergify[bot]
1700f4a929
Merge pull request #7846 from prssanna/dropbox-fix 
fix(Dropbox): Make "Take Backup Now" button visible only if dropbox is enabled
 2019-07-05 15:22:24 +00:00
Faris Ansari
1389300115 fix: bench run-ui-tests command (#7844) 
* fix: bench run-ui-tests command

BREAKING CHANGE
This replaces the old run-ui-tests command which used selenium to run
UI tests with Cypress.

Usage:

bench --site [sitename] run-ui-tests [app]
bench --site [sitename] run-ui-tests [app] --headless

* fix: Include adminPassword from site_config

* fix: string formatting
 2019-07-05 15:30:59 +05:30
Prssanna Desai
276bb8abcb fix(Dropbox): Make "Take Backup Now" button visible only if dropbox is enabled 2019-07-05 15:24:40 +05:30
Suraj Shetty
53b5855bc7
fix: Set session user only for new document (#7837) 2019-07-05 15:10:24 +05:30
Suraj Shetty
b86fc6afad
fix: Website dialog success message (#7835) 2019-07-05 15:09:53 +05:30
Faris Ansari
d719f77edb
fix(ui-tests): Pick admin password from config (#7842) 2019-07-05 12:24:07 +05:30
Suraj Shetty
9e4fff51de
fix: Avoid using session user image if image_url is passed (#7840) 2019-07-05 10:59:29 +05:30
rohitwaghchaure
5530235165
Merge pull request #7841 from scmmishra/heatmap-fix 
fix: changes for heatmap data API
 2019-07-05 00:20:28 +05:30
Suraj Shetty
2a3da6b391 test: Add test for revert_points_on_cancelled_doc 2019-07-04 23:02:46 +05:30
Suraj Shetty
f4bfc42600 fix: Add a check to see if point is already reverted 2019-07-04 23:01:39 +05:30
Suraj Shetty
4062bea097 feat: Auto revert points on the cancelled doc 2019-07-04 23:00:40 +05:30
Shivam Mishra
c8c73f5398 fix: changes for heatmap data API 
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
 2019-07-04 18:12:40 +05:30
mergify[bot]
b54e1d2dcb
Merge pull request #7836 from fproldan/fix_fixtures_develop 
fix: Custom fields order error in fixtures for develop
 2019-07-04 11:45:36 +00:00
NahuelOperto
30ef12e9ca fix: fixtures order by 2019-07-04 08:23:50 -03:00
mergify[bot]
136caed667
Merge pull request #7830 from rohitwaghchaure/not_able_to_save_event_for_customized_event_category_develop 
fix: not able to save event because of customized event category
 2019-07-04 10:50:51 +00:00
sahil28297
43c27453e9 fix(translator): send translator to .com instead of xyz (#7834) 2019-07-04 10:39:47 +00:00
mergify[bot]
ec9f3c31de
Merge pull request #7833 from surajshetty3416/fix-rtl-inline-graph 
fix: Inline graph for RTL languages
 2019-07-04 10:21:49 +00:00
Suraj Shetty
27a23b5eab fix: Inline graph for rtl languages 2019-07-04 15:10:20 +05:30
mergify[bot]
f9c6b910af
Merge pull request #7831 from scmmishra/calendar-routing-develop 
fix: last calendar routing
 2019-07-04 07:58:40 +00:00
mergify[bot]
05b89c0abb
Merge pull request #7805 from frappe-pr-bot/translations-2019-07-01 
feat: Updated translation
 2019-07-04 07:51:43 +00:00
mergify[bot]
5953e03f2e
Merge pull request #7826 from hrwX/contacts-fix 
fix(Google Contacts): Check if emails exist
 2019-07-04 07:49:28 +00:00
mergify[bot]
d4683a3fee
Merge pull request #7825 from scmmishra/chart-1.2.3 
chore: updated frappe-charts to v1.2.3
 2019-07-04 07:45:53 +00:00
mergify[bot]
98f010f62a
Merge pull request #7797 from hrwX/dom_fix 
fix(Domain): permissons for domain
 2019-07-04 07:31:48 +00:00
Shivam Mishra
93bf25c098 fix: last calendar routing 2019-07-04 13:00:11 +05:30
Rohit Waghchaure
30b78929d9 fix: not able to save event because of customized event category 2019-07-04 12:15:32 +05:30
Himanshu Warekar
acce84ea0c fix:check if emails exist 2019-07-04 01:25:28 +05:30
Shivam Mishra
c27ecfd1de chore: updated frappe-charts 2019-07-03 19:30:37 +05:30
mergify[bot]
b346b75b46
Merge pull request #7817 from Anurag810/translating_errors 
refactor: added missing translation functions
 2019-07-03 10:08:02 +00:00
Faris Ansari
7a3ef3848e
fix: Fetch color field in list view by default (#7808) 
Some views like Calendar, Gantt and Kanban use the color field for labeling. Currently, you have to add the color field in `{doctype}_list.js` for it to be fetched.
 2019-07-03 13:42:38 +05:30
Prssanna Desai
9cca919318 feat(Form): Navigate to next and previous records (#7777) 2019-07-03 13:40:55 +05:30
mergify[bot]
0f307d640c
Merge pull request #7821 from netchampfaris/refactor-link-filter-description 
refactor: Link filter description
 2019-07-03 07:33:14 +00:00
mergify[bot]
1f615ac089
Merge pull request #7816 from scmmishra/grid-checkbox 
refactor: disable checkbox for read-only grids
 2019-07-03 07:13:53 +00:00
Faris Ansari
75fb2733f1 refactor: Link filter description 
Filters can be described as objects or array. Arrays can be of length
3 or 4. Object values can be a literal or an array.

This refactor handles all these scenarios.
 2019-07-03 12:32:33 +05:30
Anurag Mishra
91d0ea010a
Update frappe/public/js/frappe/form/controls/table.js 
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
 2019-07-03 12:16:51 +05:30
Anurag Mishra
570fd44248 fix: Translating Errors and Messages 2019-07-03 11:52:47 +05:30
mergify[bot]
0540645ecc
Merge pull request #7790 from deepeshgarg007/webform_fix_v3 
fix: List context fixes in web form
 2019-07-03 06:13:30 +00:00
Shivam Mishra
e34a948e6e
refactor: removed stray else 2019-07-03 11:14:46 +05:30
Shivam Mishra
82fd9e568c
refactor: code improvements 2019-07-03 11:13:11 +05:30
Shivam Mishra
a8ec7b4941
Update frappe/public/js/frappe/form/grid.js 
Co-Authored-By: Faris Ansari <netchampfaris@users.noreply.github.com>
 2019-07-03 11:12:16 +05:30
Shivam Mishra
8c9bb0eb09
Update frappe/public/js/frappe/form/grid.js 
Co-Authored-By: Faris Ansari <netchampfaris@users.noreply.github.com>
 2019-07-03 11:11:42 +05:30
Shivam Mishra
472933c5d7 refactor: disable checkbox for read-only grids 2019-07-03 10:38:57 +05:30
Faris Ansari
a48e39abd7
chore: Enable mergify for auto merging of PRs (#7810) 
This PR enables mergify.io integration for automatic merging of Pull Requests.

Pull Requests will be merged if the following checks are passing

- Codacy
- Travis
- Semantic Title
- Snyk (package.json and requirements.txt)
- don't-merge label is not added
- PR is approved by atleast one person
 2019-07-03 10:28:55 +05:30
rohitwaghchaure
67b56a1a30
Merge pull request #7814 from hrwX/mul_sel_fix_v12 
fix(MultiSelect): do not remove header
 2019-07-03 10:22:12 +05:30
Faris Ansari
8fb2a538ec test: Add UI test for Link control (#7809) 
* test: Add UI test for Link control

- Add API cy.call
- Add API cy.create_records
- Add ui_test_helpers.py

* style: Missing semicolon

* style: Missing semicolon

* style: Missing semicolon

* style: Remove unused imports

* test: Robust test for setting invalid value

* style: Remove unused import
 2019-07-03 07:55:36 +05:30
Himanshu Warekar
d1232f939f fix: do not remove header 2019-07-02 23:46:55 +05:30