scmmishra
|
fed9adbc77
|
fix: Fixed API and UI for topic card
|
2019-02-26 16:49:15 +05:30 |
|
scmmishra
|
5ae51dc849
|
fix: Minor UI fixes
|
2019-02-26 16:48:49 +05:30 |
|
scmmishra
|
b5ba518bdb
|
style: Minor code formatting
|
2019-02-26 16:48:12 +05:30 |
|
scmmishra
|
a8ef773978
|
fix: Course Card shows topic list
|
2019-02-26 16:47:54 +05:30 |
|
scmmishra
|
a2ca8dd92f
|
fix: Route for course page
|
2019-02-26 16:47:10 +05:30 |
|
Saurabh
|
3dd7ddd838
|
Merge branch 'master' into develop
|
2019-02-21 18:25:29 +05:30 |
|
deepeshgarg007
|
0d64d622e5
|
fix: filter only unique values for tree options
|
2019-02-20 17:55:14 +05:30 |
|
scmmishra
|
62968b318f
|
wip
|
2019-02-19 18:25:07 +05:30 |
|
Sagar Vora
|
cc6e51c62d
|
Merge branch 'master' into develop
|
2019-02-19 18:09:49 +05:30 |
|
scmmishra
|
cb8ef96f6b
|
chore (css): Switched to frappe navbar
|
2019-02-19 17:03:16 +05:30 |
|
scmmishra
|
1682aa8a36
|
fix (css): Removed container class
|
2019-02-19 17:01:31 +05:30 |
|
scmmishra
|
765529241e
|
[Major][Breaking] More changes
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
689500d081
|
Minor UI Fixes
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
d02fd13bf0
|
UI Improvements: Added Custom Navbar
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
87df23b52d
|
Added quiz card on profile page
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
b3154efa84
|
UI Fixes
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
798f13be0d
|
More Improvements
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
02420bd4ba
|
Client side improvements
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
edc54cd5f6
|
Minor improvements for CardList.vue
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
2955851867
|
Built Student Profile Page
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
308f235859
|
Added Profile page
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
201fec3101
|
Minor Improvements
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
97c994f394
|
create course enrollment if not already enrolled for a program
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
cbb7c7ff23
|
ui fixes
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
788ffbd5b6
|
Minor improvements
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
9229f4fc92
|
UI fixes
|
2019-02-19 13:06:33 +05:30 |
|
scmmishra
|
fdbabde80a
|
UI fixes for course card
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
be7fadc521
|
Renamed CoursePage to ContentPage
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
d93cec374d
|
Minor UI changes
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
a592f70d4a
|
Refactored Course Progression Logic
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
8951c165f0
|
Fixed major bugs
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
53c2d5db63
|
Refactored lms store
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
babb68d36c
|
Refactored server side code
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
80ecc56cbe
|
Using lms.call across the Vue app
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
0a4902f8b5
|
UI Changes
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
c5a1226e93
|
Refactored State management store
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
85c2feec0d
|
Added ListPage and other UI improvements
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
efb01c3f75
|
Renamed components
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
2596ea0816
|
Renamed Vue Files
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
0225642459
|
Renamed Pages
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
8ff1028665
|
Renamed AcademyRoot to lmsRoot
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
1fbe2d4b2b
|
Renamed academy to lms (Client Side)
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
44921a3ee9
|
Renamed default element for Vue to mount on
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
91bbe776c1
|
Modified academy.call to point to erpnext.www.lms
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
d7c993f028
|
Minor UI changes
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
f9b2fb6717
|
Fixed course and content page
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
708756ed40
|
Added academy namespace
|
2019-02-19 13:06:32 +05:30 |
|
scmmishra
|
cc166c01eb
|
Improved Client implementation
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
8fa9adec37
|
More Bug fixes UI and Permissions
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
b409f7a388
|
Minor UI Changes and Fixes
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
86897b3cc8
|
UI: Kinda fixed "Completed" button render issue
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
5611bf4e29
|
Minor change
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
25e42baeaf
|
Course completion logic complete
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
a920bca044
|
Minor UI fixes
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
0187b18c06
|
Added methods to saving Quiz attempts
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
a3afe2a998
|
Sending session data explicitly
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
cfce153ed4
|
Minor UI changes
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
1f4835b3b4
|
Added Video UI
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
6de9cbb52d
|
Solved minor issue (Last activity not being saved)
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
1a04f774d7
|
LMS: Saving Course Activity
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
ed5892c7a5
|
UI: Components rendered based on student progress
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
a054655442
|
Updated state functions for session management
|
2019-02-19 13:06:31 +05:30 |
|
scmmishra
|
8b8db54ef4
|
Added enroll function
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
15012c08a4
|
UI Fixes
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
72fd3bc0ea
|
Removed unnecessary watcher
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
3c412f56c9
|
UI: Changes to AcademyTopSection
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
bcafe84bb6
|
Adding session management to client
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
7a19b63837
|
Minor changes
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
e30f2eb297
|
Re-factored CourseCard UI
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
6678f5b88e
|
Added custom store for state management
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
cd0cab78a5
|
Quiz UI Working
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
f7029f084c
|
Quiz is now submittable
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
cfc35f4424
|
Quiz: Save responses as an object
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
d2e040b6f1
|
Added separate ContentTitle component
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
160d8b0914
|
Added separate ContentTitle component
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
d87ca178d8
|
UI for Quiz
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
7a59f9501e
|
UI for Content
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
bcafbea481
|
UI for Course page
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
b43ab3317c
|
UI for home page and program page
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
84297fa349
|
Starting with VueJS
|
2019-02-19 13:06:30 +05:30 |
|
scmmishra
|
1778b59efa
|
Started with Vue
|
2019-02-19 13:06:30 +05:30 |
|
Rushabh Mehta
|
f3b33f3ab2
|
Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features
feat(marketplace): seller profile page
|
2019-02-18 11:24:01 +05:30 |
|
Frappe Bot
|
74fd5daeb2
|
Merge branch 'master' into develop
|
2019-02-15 10:22:33 +00:00 |
|
Faris Ansari
|
5631ffca68
|
fix: Barcode scanning UX
|
2019-02-12 17:12:48 +05:30 |
|
Sagar Vora
|
551f52fd25
|
Merge branch 'master' into develop
|
2019-02-12 16:41:24 +05:30 |
|
karthikeyan5
|
4324dc6ea8
|
fix(marketplace): fixing hubmarket server specific error
|
2019-02-12 15:12:23 +05:30 |
|
karthikeyan5
|
4df6003bd9
|
feat(marketplace): seller profile page
|
2019-02-12 15:12:23 +05:30 |
|
karthikeyan5
|
2894f7935a
|
feat(marketplace): featured Items for sellers
|
2019-02-12 15:12:23 +05:30 |
|
karthikeyan5
|
88baf53cc1
|
feat(marketplace): navigation link to seller profile from item page
|
2019-02-12 15:12:23 +05:30 |
|
Prateeksha Singh
|
3423407314
|
feat(module_links): rearrange links
|
2019-02-07 09:58:22 +05:30 |
|
Faris Ansari
|
8ae5dbcac8
|
fix: Set barcode in Item row after scanning barcode (#16591)
|
2019-02-07 07:09:49 +05:30 |
|
Sagar Vora
|
da1dc7fa52
|
Merge branch 'master' into develop
|
2019-02-05 18:40:39 +05:30 |
|
karthikeyan5
|
4cb0a250a0
|
fix(marketplace): bug in filtering menu_items
> UX improvment for incomplete feature
|
2019-02-05 18:07:48 +05:30 |
|
Saif Ur Rehman
|
1a441b267d
|
Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
# erpnext/patches.txt
|
2019-02-01 19:17:04 +05:00 |
|
Sagar Vora
|
f97c5dad82
|
Merge branch 'staging' into develop
|
2019-01-29 18:39:14 +05:30 |
|
Deepesh Garg
|
a8cc4b105d
|
Merge branch 'staging-fixes' into pos_issue
|
2019-01-29 11:29:41 +05:30 |
|
Nabin Hait
|
7c0fbfab0a
|
Merge pull request #16482 from pipech/staging-fixes
fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field
|
2019-01-29 11:23:05 +05:30 |
|
Nabin Hait
|
3ccc16e4e0
|
Merge pull request #16449 from scmmishra/remove-foundation
feat: Deprecated In App Help
|
2019-01-29 11:20:23 +05:30 |
|
deepeshgarg007
|
49cca7ac76
|
fix: Customer based price_list in online POS
|
2019-01-25 16:41:01 +05:30 |
|
Shivam Mishra
|
67c338fd51
|
[fix] Fixed links
Previous commit missed the links starting with `http://`
|
2019-01-25 15:17:44 +05:30 |
|