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

2324 commits

Author SHA1 Message Date
Shivam Mishra
8621c3776b update branch 2019-06-12 11:13:23 +05:30
Shivam Mishra
067cc9d775 feat: added frappe.Chart globally 2019-06-12 11:08:47 +05:30
Shivam Mishra
5faedacd5d fix: mysql error for activity 2019-06-11 16:15:46 +05:30
Shivam Mishra
7045942e8d refactor: use es6 imports for charts 2019-06-11 15:41:44 +05:30
Himanshu
0cefc9264b fix(Communication): table doesn't exist (#7624) 
* fix: table doesnt exist

* fix: import frappe
 2019-06-02 08:57:17 +05:30
Rushabh Mehta
a145c88256
Merge pull request #7611 from adityahase/validate-fieldname 
fix(doctype): Fieldname should not be in restricted fieldnames
 2019-05-30 17:12:40 +05:30
Faris Ansari
7f24a3f71d fix: Show user fullname in mentions (#7592) 
* fix: Show user fullname in mentions

* fix: Remove unused import

* fix: Update tests
 2019-05-30 16:37:40 +05:30
Aditya Hase
f16476a117 fix(doctype): Fieldname should not be in restricted fieldnames 
If fieldname wasn't provided and the fieldname generated from label
was found to be in restricted names then 1 was appended to the newly
prepared fieldname
e.g. Name becomes name1

But the fieldname was allowed to be edited later to bypass this restriction
i.e.. name1 can be renamed to name

This fixes that.

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-05-30 16:06:59 +05:30
Karthikeyan S
0404390064 fix(Barcode): excluding Barcode feild from XSS FIlter (#7604) 2019-05-30 13:50:05 +05:30
Mangesh-Khairnar
f75aa3beff fix: add rating field in docfield (#7571) 2019-05-28 14:21:20 +05:30
Rushabh Mehta
1c893e44c0 fix: frappe.conf.db_type -> frappe.db.db_type 2019-05-24 11:44:28 +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
84201b9d3b
Merge pull request #7300 from rohitwaghchaure/feat_force_user_to_reset_password_develop 
feat: force user to reset password after x days
 2019-05-23 15:00:31 +05:30
Anurag Mishra
2ffc939fb5
fix: Doctype some tests and fix (#7536) 
* test: some tests and fix

* Update test_doctype.py
 2019-05-22 18:11:45 +05:30
Himanshu
2b14c95644 fix(Communication): New child doctype for Communication Timeline Links (#7524) 
* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
 2019-05-21 20:48:55 +05:30
Rushabh Mehta
28ed21b94c
Merge pull request #7419 from josejibin/fix/postgres-compatible 
fix(postgres): Make db queries postgres compatible
 2019-05-20 18:02:30 +05:30
Himanshu Warekar
81d314bf10 fix: typo fixes 2019-05-20 14:40:20 +05:30
Himanshu Warekar
b4e561c047 tests: fix test cases 2019-05-20 14:15:57 +05:30
Himanshu Warekar
c86ba03632 tests: fix test cases 2019-05-20 13:38:01 +05:30
Himanshu Warekar
127cf29a20 tests: added new test cases 2019-05-20 13:04:16 +05:30
jibin jose
1a58c13966 fix(postgres): Make db queries postgres compatible 2019-05-20 12:31:30 +05:30
Himanshu Warekar
defe1b2eef fix: miscellaneous changes 2019-05-18 13:37:00 +05:30
Himanshu Warekar
9f02f4284d patch: optimisations 2019-05-18 00:35:17 +05:30
Himanshu Warekar
08fb052334 fix: rename dynamic links to timeline links 2019-05-17 14:21:37 +05:30
Himanshu Warekar
447019b947 Merge develop into comm_ref 2019-05-17 00:25:24 +05:30
Himanshu Warekar
0d9b7048d9 fix: tests for communication 2019-05-17 00:06:38 +05:30
Himanshu Warekar
aa98dd28a6 test: communication tests 2019-05-16 20:04:49 +05:30
Rushabh Mehta
e03539703c
Merge pull request #7502 from rmehta/link-preview-fixes 
fix(link-preview): show preview only if setup and cleanup style
 2019-05-16 19:32:55 +05:30
Rushabh Mehta
0284b1a965 fix(null-handling): for doctype, doctype, ignore null values 2019-05-16 15:44:46 +05:30
Rushabh Mehta
e5b97de255 fix(minor): default check value to 0 and validate 2019-05-16 15:00:14 +05:30
Himanshu Warekar
a4478afcd5 Merge branch 'develop' of https://github.com/frappe/frappe into comm_ref 2019-05-16 13:03:46 +05:30
Rushabh Mehta
b19f84120c fix(link-preview): show preview only if setup and cleanup style 2019-05-16 10:24:43 +05:30
Himanshu Warekar
b31070d427 fix: delete_doc for timeline references 2019-05-15 18:00:16 +05:30
Saurabh
25b190bb9c fix: permission fix for prepared report 2019-05-15 13:48:33 +05:30
Himanshu Warekar
d230bf4cea patch: migarte timeline links to dynamic links 2019-05-14 17:39:55 +05:30
Himanshu Warekar
f114e03c8c Merge branch 'develop' into comm_ref 2019-05-14 16:18:32 +05:30
Saurabh
abe1defb25
Merge pull request #7463 from rmehta/remove-feedback-trigger 
BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms
 2019-05-14 15:18:44 +05:30
Himanshu Warekar
5d09fb26a9 fix: timeline docs to dynamic links 2019-05-14 12:01:14 +05:30
Himanshu Warekar
8381e0048a feat: Communication refactor initial bringup 2019-05-13 20:39:49 +05:30
Rushabh Mehta
3d26d2dd22 BREAKING CHANGE: remove Feedback Trigger and Feedback Rating, this was not very configurable and can now be done better with Web Forms 2019-05-13 14:18:02 +05:30
Suraj Shetty
1556805232 fix: Make query postgres compatible 2019-05-13 10:26:48 +05:30
Rohit Waghchaure
408b46acb4 Updated expired message 2019-05-11 16:31:10 +05:30
Rohit Waghchaure
cf932a834a feat: force user to reset password after x days 2019-05-11 15:25:32 +05:30
Deepesh Garg
84466b54c4
Merge pull request #7442 from deepeshgarg007/custom_auto_email_develop 
fix: Auto email support for Custom Reports
 2019-05-10 22:33:05 +05:30
Rushabh Mehta
de58a59402
Merge pull request #7428 from saurabh6790/prepared_repo_fix 
fix: enqueue prepared report after committing prepared report record
 2019-05-10 08:29:40 +05:30
Rushabh Mehta
a6aec85674
Merge pull request #7407 from surajshetty3416/communication-email-template 
feat: Add email template field to Communication
 2019-05-10 08:28:29 +05:30
deepeshgarg007
f7c9064038 fix: Auto email support for custom reports 2019-05-09 22:42:54 +05:30
Saurabh
d99423ce1c fix: enqueue prepared report after commiting prepared report record 2019-05-08 16:20:47 +05:30
Mangesh-Khairnar
fbd58f2fe5
fix(user-permission): remove typo 2019-05-07 18:39:18 +05:30
Suraj Shetty
8af25cce99 feat: Add email template field to Communication 2019-05-04 17:32:03 +05:30