Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,778 Commits 3 Branches 0 Tags 1 GiB
a1d3a09d3c
Commit Graph

262 Commits

Author SHA1 Message Date
Faris Ansari
1c1b476d67
perf: Optimize get_attribute_filters (#26729) 
* perf: Optimize get_attribute_filters

* fix: handle when filter attributes are undefined

* chore: unused imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-14 11:41:19 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
18alantom
ddbf7c0020 fix: set item group as a persistent filter 2021-07-14 15:43:22 +05:30
Mohammed Yusuf Shaikh
86f41839fe
fix: Added a message to enable appointment booking if disabled (#26233) 
* fix: Added a message to enable appointment booking if disabled

* refactor: added translation for the message

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

* fix: added missing import

* fix: minor identation and space fix

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-02 12:19:24 +05:30
pateljannat
bbf07d9214 fix: quiz timer issues 2021-06-08 17:05:44 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz (#24246) 
* feat: new fields in quiz doctypes

* feat: timer in lms quiz

* fix: variable initialisation

* fix: context, exception fix

* fix:sider

* fix:sider

* fix: indentation

* fix: timer

* fix: sider

* fix: return value and format

* fix: show time taken only after all attempts are over

* fix: sider

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-19 10:36:40 +05:30
Francisco Roldán
894cff5aa4
fix: lms program and index missing context variables when is no data available (#24828) 
* fix: program and index

* fix: moved default value to  get_course_progress
 2021-03-09 23:35:24 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes (#24489) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes
 2021-02-02 22:03:07 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
prssanna
b00eb1b0cc feat: shopping cart page 2021-01-20 17:52:54 +05:30
prssanna
ac7bc78afe fix: show product price in item card 2021-01-20 17:46:19 +05:30
prssanna
599322871a fix: product query issues 2021-01-20 17:44:08 +05:30
Shivam Mishra
31a651365d feat: update item group website slider 2020-12-30 15:51:34 +05:30
Shivam Mishra
565b178721 feat: use ProductFiltersBuilder in all products page 2020-12-29 17:18:58 +05:30
Shivam Mishra
293f483cb4 feat: add ProductQuery engine 2020-12-24 17:54:07 +05:30
prssanna
eb0e596d43 feat: store home page and product page 2020-12-24 11:40:33 +05:30
Deepesh Garg
468f67a4de fix: Add parent for all-products page 2020-12-22 12:44:09 +05:30
Syed Mujeer Hashmi
c17cdd7c2e
fix: Fix for LMS Sign Up link (#23743) 
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-10-29 11:10:06 +05:30
Shivam Mishra
42fd2312b8 style: add styles in style block 2020-06-25 15:28:58 +05:30
Shivam Mishra
3bbbd1b606 feat: added search to support page 2020-06-25 15:28:58 +05:30
Shivam Mishra
53346217d2
Revert "feat: added search to support page (#22376)" (#22431) 
This reverts commit 3ab8d865dd.
 2020-06-25 11:12:09 +05:30
Shivam Mishra
3ab8d865dd
feat: added search to support page (#22376) 
* feat: added search to support page

* style: add styles in style block
 2020-06-24 15:50:06 +05:30
Alvaro
43be163b32
feat: Enabled translation on html files in LMS [Proposal] (#21582) 
* :fix:  translation fix for html files in LMS

* fix: typo in translation

* Update content.html

* Update content.html

* Update profile.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-22 11:06:12 +05:30
Afshan
ea78b24035
style: subtitle to be displayed if provided else empty (#22298) 
* added: /support

* refactor code and implemented fail checks

* removed unused imports

* changed filter from from title to name

* refactor code to move context inside main

* removed unused variable

* added: /support

* refactor code and implemented fail checks

* removed unused imports

* changed filter from from title to name

* refactor code to move context inside main

* removed unused variable

* refactor: renamed set to get

* style: subtitle to be displyed if provided else empty

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-18 09:49:35 +05:30
Shivam Mishra
64d772480b
fix: limit max length for cards (#22289) 2020-06-17 18:48:15 +05:30
Shivam Mishra
6e231ae0cb refactor: remove translation 2020-06-17 18:43:59 +05:30
Shivam Mishra
2462f07c87 refactor: update titles 2020-06-17 18:39:49 +05:30
Shivam Mishra
2b18bdfe72 fix: title for support 2020-06-17 18:36:51 +05:30
Shivam Mishra
7057a807ca refactor: minor layout fixes to portal 2020-06-17 18:35:38 +05:30
Afshan
8546b71358
feat: /support (#22194) 
* added: /support

* refactor code and implemented fail checks

* removed unused imports

* changed filter from from title to name

* refactor code to move context inside main

* removed unused variable

* added: /support

* refactor code and implemented fail checks

* removed unused imports

* changed filter from from title to name

* refactor code to move context inside main

* removed unused variable

* refactor: renamed set to get

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-17 16:16:59 +05:30
Chinmay Pai
49b2b155b6
fix: sanitize all-products search before displaying results (#21764) 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-05-26 18:21:11 +05:30
Himanshu Warekar
c207c457a5 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-04-06 11:34:27 +05:30
Shivam Mishra
3251e1304c
fix: lms quiz type error (#21152) 2020-04-03 10:08:19 +05:30
Himanshu Warekar
841be6713b Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-03-13 19:40:00 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Pranav Nachnekar
c1312700e8 feat: create appoitnemnt against customer (#20457) 2020-01-28 17:50:47 +05:30
Himanshu Warekar
c9f497d7c0 feat: move subject and sender fields to json 2020-01-13 16:26:40 +05:30
0Pranav
e786eea7db remove comments 2019-12-18 16:25:26 +05:30
0Pranav
84ae2cc543 fix: defualt timezone not getting selected 2019-12-18 15:47:10 +05:30
0Pranav
d3605d2354 fix: issue in javascript timezones 2019-12-11 15:02:23 +05:30
Pranav Nachnekar
6aa763221b fix: rename appointment booking route (#19886) 
* rename appoinment booking route

* fix: replace all references to book-appointment route
 2019-12-10 21:35:28 +05:30
Pranav Nachnekar
ae02b4119d add init.py for appointment modules (#19823) 2019-12-09 19:03:35 +05:30
0Pranav
fb1e87710b Tweaks to success redirect 
- 5 seconds wait before redirect
- Edited description for URL in settings
 2019-11-26 12:14:41 +05:30
0Pranav
511780a4d4 feat: configurable redirect on success 2019-11-14 12:47:08 +05:30
0Pranav
793ba8fc06 pretty timezone names 2019-11-14 11:25:49 +05:30
0Pranav
c31808f5b2 fix margins 2019-11-13 16:47:51 +05:30