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

2935 commits

Author SHA1 Message Date
mergify[bot]
4e3706763a
Merge pull request #10040 from Thunderbottom/data-validation-fix 
fix: skip validation if oldfieldtype is not set to data
 2020-04-24 17:26:11 +00:00
mergify[bot]
c4f8471960
Merge pull request #10011 from gavindsouza/update-password 
fix: Message on reset password
 2020-04-24 17:25:02 +00:00
Gavin D'souza
442810e7c0 fix: updated http_status_code and message 2020-04-24 18:33:53 +05:30
Chinmay Pai
0296908f18
fix: only allow ldap reset password for system manager (#10076) 
* fix: only allow ldap reset password for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: only check for system manager

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* fix: Syntax error

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-23 17:52:15 +05:30
Rucha Mahabal
8c63e4de2e fix(minor): Value Error during importing or exporting document files in migrate 2020-04-23 01:49:43 +05:30
mergify[bot]
118d1e3de6
Merge pull request #10042 from ruchamahabal/move-video 
fix: Permissions for Video DocType
 2020-04-22 08:22:35 +00:00
Chinmay D. Pai
919562e60e
fix: skip data validation on creation if oldfieldtype is set 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-22 12:22:46 +05:30
Rucha Mahabal
be6c58d606 fix: permissions for Video DocType 2020-04-22 12:10:18 +05:30
mergify[bot]
e950b2e45d
Merge pull request #9910 from ruchamahabal/move-video 
feat: Add Video DocType
 2020-04-22 05:20:55 +00:00
Aditya Hase
f6f55fa0ad
fix(background jobs): Show method name on Background Jobs page. (#10014) 
After https://github.com/frappe/frappe/pull/8486 background jobs page doesn't provide any information.
 2020-04-20 13:32:18 +05:30
Rushabh Mehta
b7b0f1ddb1
Merge pull request #9999 from rmehta/webview-fixes-1 
fix(web view): Made Web Views embeddable & other enhancements
 2020-04-20 10:28:08 +05:30
Rushabh Mehta
fb4338b780 fix(test): Exporter test, uses Web Page 2020-04-19 22:18:24 +05:30
prssanna
3b5a1aaa3f fix: fix position of mandatory field in docfield 2020-04-19 21:56:31 +05:30
Rushabh Mehta
9f26548b31 fix(minor): update web page test and allow dashboards for custom doctype 2020-04-19 18:01:06 +05:30
Gavin D'souza
4fa3522c3b Merge branch 'develop' into misc-fix-1 2020-04-17 13:40:49 +05:30
Rucha Mahabal
938684759b fix: update Roles in Video DocType 2020-04-17 13:35:17 +05:30
Suraj Shetty
81706ef773
Merge branch 'develop' into move-video 2020-04-17 12:18:35 +05:30
Suraj Shetty
3db595f06d
Delete test_video.js 2020-04-17 12:15:49 +05:30
Chinmay Pai
6d8540fbe2
Merge pull request #9849 from saurabh6790/scheduler_based_server_scripts 2020-04-17 11:09:22 +05:30
Suraj Shetty
2d21afb49b
Merge pull request #9980 from marination/language-code 
fix: User should not be able to create a language
 2020-04-17 09:31:33 +05:30
marination
0cdcfdcd9e fix: User should not be able to create a language 2020-04-16 22:13:51 +05:30
Rushabh Mehta
e323441c15 feat: Add Web View to compose webpages with components 2020-04-15 23:12:57 +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
Suraj Shetty
310f32175b fix: Allow private files if owner is accessing 2020-04-13 17:07:38 +05:30
Suraj Shetty
c188de8947 fix: No access for private files by default 2020-04-13 16:10:34 +05:30
Rucha Mahabal
558fec0d7c fix: move Video DocType from Education Module to Core 2020-04-10 23:40:34 +05:30
Shivam Mishra
d4e6b89863 Merge branch 'develop' of github.com:frappe/frappe into desk-user-custom 2020-04-10 15:48:53 +05:30
Abhishek Kedar
5d92e7cf9f
fix: checking value of send_welcome_email (#9888) 
* checking value of send_welcome_email

If send_welcome_email is set to 0 still it is triggering send_welcome_mail_to_user(). Need to check if send_welcome_email=1.
This is required.

* fix: cint(self.send_welcome_email) in user.py

Instead of checking self.send_welcome_email==1 used cint(self.send_welcome_email

Co-Authored-By: Chinmay Pai <chinmaydpai@gmail.com>

* chore: remove list from kwargs

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
 2020-04-10 15:30:09 +05:30
Gavin D'souza
0a0045e9cc chore: raise exception via frappe.msgprint 2020-04-10 13:38:51 +05:30
Shivam Mishra
4764f65c13 Merge branch 'develop' of github.com:frappe/frappe into desk-user-custom 2020-04-08 18:12:43 +05:30
Gavin D'souza
24e0174fcf fix: enable validations for email and phone data fields 2020-04-08 12:35:33 +05:30
Shivam Mishra
3dd2c756f1 fix: added comma 2020-04-06 14:00:43 +05:30
Saurabh
30e7d9e151 feat: link server scripts in scheduler 2020-04-06 12:05:48 +05:30
mergify[bot]
5fabf8ce00
Merge pull request #9641 from scmmishra/report-perm-fix 
fix: Prepared Report permissions
 2020-04-05 14:32:22 +00:00
Saurabh
6624f3a1af enhancement: provision to scheduled server scripts execution 2020-04-03 18:13:27 +05:30
mergify[bot]
245ef7d383
Merge pull request #9830 from prssanna/save-dashboard-filters 
feat(Dashboard): Save dashboard chart config for user
 2020-04-03 12:18:19 +00:00
mergify[bot]
02b256b089
Merge pull request #9743 from Thunderbottom/ldap-password-reset 
feat(ldap): allow resetting ldap password from user settings
 2020-04-03 05:41:17 +00:00
Chinmay D. Pai
1f3f8b9246
chore: fix codacy issues 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-04-03 09:57:44 +05:30
prssanna
f79a43d5f3 feat: save dashboard chart config for user 2020-04-02 12:12:40 +05:30
mergify[bot]
c1533cfb95
Merge pull request #9777 from prssanna/report-export-columns 
fix(Report): Export custom columns in Excel
 2020-04-02 06:16:48 +00:00
gavin
0177c03139
Merge pull request #9784 from gavindsouza/data-options 
feat: Validate Data options and Data values
 2020-04-01 14:00:48 +05:30
Suraj Shetty
a8af9e91bc style: Fix indentation 2020-04-01 12:48:00 +05:30
Suraj Shetty
fe54fb67c9 refactor: generate_report_result method 
- to fix codacy complexity issue
 2020-04-01 12:34:18 +05:30
Gavin D'souza
b5a9250574 tests: simplifying test_data_field_options 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-04-01 12:00:03 +05:30
Shivam Mishra
c67ecbc6ba feat: update desk pages 2020-04-01 11:25:15 +05:30
mergify[bot]
843469d268
Merge pull request #9789 from prssanna/dashboard-permissions 
refactor(Dashboard): Refactor dashboard permissions
 2020-04-01 05:35:42 +00:00
Gavin D'souza
9393c05b13 tests: updated tests to cover more data field options 2020-04-01 10:47:43 +05:30
rohitwaghchaure
62c5c0e6f9
Merge pull request #9822 from rohitwaghchaure/fixed_roles_not_refreshing_in_role_profiles_develop 
fix: navigate between role profiles not changes the roles
 2020-03-31 16:50:09 +05:30
Rohit Waghchaure
1d4a14802e fix: navigate between role profiles not changes the roles 2020-03-31 16:47:45 +05:30