Commit graph

28473 commits

Author SHA1 Message Date
Rucha Mahabal
7d70e552aa chore: added a docstring for the get_next_schedule_date method 2020-12-16 12:09:10 +05:30
Rucha Mahabal
4c1756b3d6 fix: code clean-up and fallbacks for get method 2020-12-16 11:29:05 +05:30
Rucha Mahabal
6398ca7db7 refactor: move common functions as methods to the Auto Repeat class 2020-12-11 12:11:07 +05:30
Rucha Mahabal
6350291dc2
Merge branch 'develop' into auto_repeat_weekdays 2020-12-11 11:39:42 +05:30
mergify[bot]
10626eede4
Merge pull request #12019 from nextchamp-saqib/abs-value-in-pf
feat: show absolute value in print format
2020-12-10 14:58:33 +00:00
Saqib Ansari
0651341bf8 feat: show absolute value checkbox if doctype has appropriate fields 2020-12-10 20:01:06 +05:30
mergify[bot]
ff3148dbd2
Merge pull request #11979 from everyx/develop
fix: `PRIMARY KEY must be NOT NULL` error when install with MySQL 5.7+
2020-12-10 12:55:27 +00:00
mergify[bot]
0217146485
Merge pull request #12069 from ruchamahabal/auto-repeat-submit-on-creation
feat(Auto Repeat): Submit on Creation configuration
2020-12-10 12:26:05 +00:00
Rucha Mahabal
ec0d1dd63f fix: added server side validation for submit on creation 2020-12-10 17:18:13 +05:30
Faris Ansari
2b9d176630
Merge pull request #12033 from netchampfaris/fix-base-path-restore 2020-12-10 14:07:21 +05:30
Faris Ansari
9e954a7372 style: quotes 2020-12-10 13:52:21 +05:30
Faris Ansari
5a60048a0a test: for get_bench_relative_path 2020-12-10 12:31:01 +05:30
Rucha Mahabal
30fbf37f25 test: submit on creation 2020-12-10 11:48:12 +05:30
Faris Ansari
6289d7dd59
Merge pull request #12056 from anupamvs/date-format
feat: added data format support DD-Mon-YY
2020-12-10 11:17:38 +05:30
mergify[bot]
8919645f32
Merge pull request #12067 from scmmishra/fix-seconds-cint
fix: cint seconds before operations
2020-12-10 05:26:04 +00:00
Rucha Mahabal
c805851ebe feat(Auto Repeat): Submit on Creation configuration 2020-12-10 10:52:50 +05:30
Shivam Mishra
86bf61ccf9
Merge pull request #12002 from scmmishra/fix-localstorage-quota-exceed 2020-12-10 10:42:06 +05:30
Shivam Mishra
c5d0830553 fix: cint seconds before operations 2020-12-10 10:37:29 +05:30
Faris Ansari
b08d834363
Merge pull request #12034 from netchampfaris/permission-query-server-script 2020-12-09 20:37:00 +05:30
Faris Ansari
3f8b4a70f4
Merge branch 'develop' into permission-query-server-script 2020-12-09 19:51:37 +05:30
mergify[bot]
a3bad373ca
Merge pull request #12018 from scmmishra/feat-allow-html-in-email-temlate
feat: allow html in email templates
2020-12-09 12:58:06 +00:00
Shivam Mishra
b2b36c852d
Merge pull request #12050 from prssanna/shorten-number
refactor: shorten_number function
2020-12-09 16:58:28 +05:30
Shivam Mishra
948f4171e3
Merge pull request #12057 from prssanna/dashboard-filter-modules 2020-12-09 16:55:05 +05:30
Shivam Mishra
309f483bb3
refactor: update return statement 2020-12-09 16:54:40 +05:30
Anupam
e197a6fd7f feat: added data format support DD-Mon-YY 2020-12-08 17:07:32 +05:30
prssanna
3a11ef3365 fix: filter dashboards, dashboard charts, number cards by modules 2020-12-08 12:46:16 +05:30
mergify[bot]
0712d01d43
Merge pull request #12030 from anupamvs/customize-from
feat: provision to open child table in customize form
2020-12-07 10:21:23 +00:00
prssanna
c5677b52d0 refactor: shorten_number function
- pass min_length and max_no_of_decimals
2020-12-07 15:49:22 +05:30
Faris Ansari
60a55cbcf8
Merge pull request #12035 from netchampfaris/newsletter-render-template
fix(newsletter): Render template for HTML content type
2020-12-07 14:17:42 +05:30
Shivam Mishra
055a97898d
Merge pull request #12038 from prssanna/assign-to-label
fix: label for _assign field
2020-12-07 11:54:04 +05:30
Prssanna Desai
b267084f21
Merge pull request #12039 from prssanna/number-card-diff-fix
fix: use frappe.utils.shorten_number
2020-12-04 19:35:04 +05:30
prssanna
beec0b48fb fix: use frappe.utils.shorten_number 2020-12-04 18:31:16 +05:30
Gavin D'souza
3ce680a5f9 Merge branch 'develop' of github.com:frappe/frappe into fix-base-path-restore 2020-12-04 18:17:59 +05:30
Gavin D'souza
1b609af8e5 fix: Handle paths relative to bench root and sites folder 2020-12-04 18:15:17 +05:30
Abhishek Balam
3676f8dc6f
Merge pull request #11720 from saurabh6790/format-email-fix
fix: validate email id before passing to formataddr
2020-12-04 17:42:53 +05:30
Abhishek Balam
d229e363b3 fix: revert cstr import added 2020-12-04 17:10:42 +05:30
Abhishek Balam
9d060f9653 fix: cstr import added 2020-12-04 17:01:55 +05:30
mergify[bot]
b6a7c5ed97
Merge pull request #12031 from hasnain2808/multiple-y-values-in-charts
fix: Multiple y rows in charts
2020-12-04 10:56:35 +00:00
prssanna
69befda08e fix: label for _assign field 2020-12-04 16:12:22 +05:30
Faris Ansari
e338f2f7b6 fix(newsletter): Render template for HTML content type 2020-12-03 23:56:26 +05:30
Faris Ansari
9ac14fb5ab feat: Permission Query script type
Add dynamic conditions in where clause of get_list query
2020-12-03 23:26:34 +05:30
Faris Ansari
ee3fa3e4e0 fix: Remove unreferenced variable base_path 2020-12-03 22:39:38 +05:30
mergify[bot]
c394488f79
Merge pull request #12008 from gavindsouza/server-script-fixes
fix: Server scripts enhancements
2020-12-03 11:32:21 +00:00
Mohammad Hasnain
6c48c2d14a fix(charts): escape nan in each y axis 2020-12-03 15:38:58 +05:30
Anupam
a19932835a feat: provision to open child table in customize form 2020-12-03 12:44:28 +05:30
Anuja Pawar
aadbdfbd84
refactor(System Settings): Remove redundant code (#12027)
Co-authored-by: Anuja <anuja-frappe@Frappe.local>
2020-12-02 17:51:38 +05:30
Rushabh Mehta
fa80d26f4c fix(minor): update requirements.txt 2020-12-02 09:46:48 +05:30
Abhishek Balam
9e5c1a9a52
Merge pull request #12014 from abhishekbalam/image_metadata_strip
feat(File): Option to strip EXIF data from image files before uploading
2020-12-01 17:52:21 +05:30
Leela vadlamudi
e760c39c68
chore: Add .editorconfig to enforce consistent styling (#12021)
Github respects editorconfig settings. Adding indent_size as 4 in
settings makes github indent code to 4 columns.
2020-12-01 16:34:19 +05:30
Abhishek Balam
e306f5601c fix: made requested changes 2020-11-30 18:58:53 +05:30