Commit Graph

589 Commits

Author SHA1 Message Date
Jannat Patel
59e853a012 fix: removed unnecessary lines 2021-10-25 11:52:08 +05:30
Jannat Patel
79bca49fb8 Merge branch 'main' into rename-app-to-school 2021-10-25 11:17:04 +05:30
Jannat Patel
05b0ca49fa fix: ci (#248) 2021-10-25 11:05:50 +05:30
Jannat Patel
8483b7b86b fix: conflicts 2021-10-24 12:09:31 +05:30
Jannat Patel
050cfa494c fix: conflicts 2021-10-24 12:03:06 +05:30
Jannat Patel
866829af97 Merge pull request #247 from pateljannat/fix-ui-quiz 2021-10-24 11:43:11 +05:30
Jannat Patel
0cd52b7220 style: quiz cta 2021-10-24 11:30:51 +05:30
Jannat Patel
b922af1411 Merge pull request #243 from anandology/docker-compose-fixes 2021-10-24 11:30:05 +05:30
Jannat Patel
ce01e83382 style: changed quiz button to secondary 2021-10-22 18:55:55 +05:30
Jannat Patel
60393e048e Merge pull request #246 from pateljannat/workspace 2021-10-21 18:50:39 +05:30
Jannat Patel
1f7e2cd0cc feat: new school workspace 2021-10-21 18:19:11 +05:30
Jannat Patel
747828b363 Merge pull request #244 from pateljannat/dashboard 2021-10-21 17:14:22 +05:30
Jannat Patel
b722eedb05 fix: ci removed frappe path 2021-10-21 16:21:20 +05:30
Jannat Patel
2f664faea9 fix: ci 2021-10-21 16:17:39 +05:30
Jannat Patel
e9b545c488 fix: empty state 2021-10-21 15:58:26 +05:30
Jannat Patel
bb62f626fd feat: dashboard web templates 2021-10-21 12:53:36 +05:30
Anand Chitipothu
58fe403bd0 fix: docker-compose setup
The new image of anandology/frappe-bench has the following changes:
- the bench directoy is changed from /home/bench/frappe-bench to /opt/frappe-bench
- dependency on external redis service is removed

Updated the docker-compose.yml to reflect these changes. Also pinned the
docker image to anandology/frappe-bench:2021.10
2021-10-21 09:51:37 +05:30
Jannat Patel
5ae5bab76b Merge pull request #242 from pateljannat/course-progress-optimisation 2021-10-20 16:23:15 +05:30
Jannat Patel
049c374ece fix: convert progress to int for comparision 2021-10-20 16:12:41 +05:30
Jannat Patel
66e8ac9cae fix: get progress from membership 2021-10-20 12:05:13 +05:30
Jannat Patel
f5af07086b Merge branch 'main' of https://github.com/frappe/school into rename-app-to-school 2021-10-19 19:20:31 +05:30
Jannat Patel
4d534db63f Merge pull request #241 from pateljannat/fix-styles 2021-10-19 19:18:46 +05:30
Jannat Patel
aec69e96cb fix: style for certificate button and card responsive 2021-10-19 19:09:42 +05:30
Jannat Patel
6172b09aa3 fix: conflicts 2021-10-19 12:37:16 +05:30
Jannat Patel
98c386729c Merge pull request #240 from pateljannat/fix-translation-issue 2021-10-18 13:29:58 +05:30
Jannat Patel
91ebcd8253 fix: translation issue 2021-10-18 13:28:48 +05:30
Jannat Patel
3a51299e8d Merge pull request #239 from pateljannat/fix-rating-issue 2021-10-18 13:18:26 +05:30
Jannat Patel
eaa8876f4e fix: made quotes same throughout file 2021-10-18 13:13:19 +05:30
Jannat Patel
7d80178b48 fix: allow import on course chapter lesson quiz 2021-10-18 13:02:11 +05:30
Jannat Patel
8090f2f397 fix: made strings translatable 2021-10-18 12:43:34 +05:30
Jannat Patel
bf986e26bc fix: rating issue 2021-10-18 12:24:37 +05:30
Jannat Patel
c95d957d2c refactor: build file and patch 2021-10-13 13:51:41 +05:30
Jannat Patel
b1aaddae59 Merge pull request #235 from anandology/fix-reindex-exercises
fix: error on reindex-exercises
2021-10-12 17:23:13 +05:30
Anand Chitipothu
8fe9bad2bb fix: error on reindex-exercises
Issue fossunited/mon_school#69
2021-10-12 12:38:26 +05:30
Jannat Patel
23dab6312d Merge pull request #233 from pateljannat/quiz-question-length-issue
fix: quiz question length issue
2021-10-12 10:48:32 +05:30
Jannat Patel
c91b1a7a23 fix: quiz question length issue 2021-10-12 10:34:15 +05:30
Jannat Patel
d07dbcc50a refactor: renamed app to school 2021-10-11 20:31:27 +05:30
Jannat Patel
49771a627d Merge pull request #232 from anandology/ignore-xss-for-lesson
fix: fixed the issue of lesson body getting mangled on save
2021-10-11 17:13:50 +05:30
Anand Chitipothu
25ec4ae7c6 fix: fixed the issue of lesson body getting mangled on save
enabled `ignore_xss_filter` for lesson body to disable sanitizing the
input.

Issue #231
2021-10-11 15:34:16 +05:30
Jannat Patel
13022e0bcc Merge pull request #229 from pateljannat/ix-profile-cards 2021-10-08 20:34:58 +05:30
pateljannat
cdc4b6992d fix: clickable course cards from profile page 2021-10-08 20:28:06 +05:30
Jannat Patel
f178f3806d Merge pull request #224 from pateljannat/change-patch-sequence 2021-10-06 21:52:34 +05:30
pateljannat
d84f621813 fix: patch sequence 2021-10-06 21:33:13 +05:30
Jannat Patel
7ba2ac1efd Merge pull request #222 from pateljannat/ci-fix 2021-10-04 13:39:51 +05:30
Jannat Patel
658a9e6172 fix: path to frappe-bench 2021-10-04 13:26:06 +05:30
Jannat Patel
0b44e78cc2 fix: removed frappe-path 2021-10-04 13:20:08 +05:30
Jannat Patel
1c5766d022 Merge pull request #205 from pateljannat/discussions-shift 2021-10-04 13:10:56 +05:30
pateljannat
3bff000cc9 fix: bench init command 2021-10-04 12:21:02 +05:30
pateljannat
30a8750f16 fix: ci 2021-10-04 10:34:47 +05:30
pateljannat
f3ad3f6d18 Merge branch 'main' of https://github.com/fossunited/community into discussions-shift 2021-10-03 12:12:31 +05:30