summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-21Get latest changes and resolve conflictsadityacp
2020-07-01Merge pull request #153 from FOSSEE/revampv2Palaparthy Adityachandra
Revamp workshop website
2020-07-01Merge branch 'revampv2' of https://github.com/FOSSEE/workshop_booking into ↵adityacp
revampv2
2020-07-01Change views, models, settings, urlsadityacp
- Fix pep8 in app urls - Add default django forgot password url in project url - Add uuid field in workshop model - fix few pep8 in the models.py - Add template directory in settings - Update requirements.txt
2020-07-01Change templatesadityacp
- Add custom template tag to check user group - Disable propose workshop option for the instructor - Show a generic message info in the propose workshop section - Fix forgot password - Make a proper footer - Remove navbar options in the login page - Other minor fixes
2020-06-30Merge pull request #144 from pnshiralkar/messagesPalaparthy Adityachandra
Messages
2020-06-30Merge pull request #139 from pnshiralkar/fix-profile-pagePalaparthy Adityachandra
Fixed view profile page, closes #137
2020-06-27Merge branch 'messages' of https://github.com/pnshiralkar/workshop_booking ↵adityacp
into revampv2
2020-05-29Added messages to save, update, delete and other eventspnshiralkar
2020-05-29Setup messages frontendpnshiralkar
2020-05-29Merge branch 'revampv2' of https://github.com/FOSSEE/workshop_booking into ↵pnshiralkar
fix-profile-page
2020-05-29Merge pull request #142 from pnshiralkar/replace-cdnankitjavalkar
Replace CDN with static
2020-05-28Merge pull request #140 from pnshiralkar/fix-footer-tnc-modal-close-btnankitjavalkar
Fixed footer and Terms and conditions close button
2020-05-28Solved merge conflictspnshiralkar
2020-05-22Replaced CDN with local filespnshiralkar
2020-05-21Merge pull request #131 from pnshiralkar/workshop-commentsankitjavalkar
Workshop comments
2020-05-19Merge branch 'revampv2' of https://github.com/FOSSEE/workshop_booking into cmspnshiralkar
2020-05-19Fixed footer and Terms and conditions close button, resolves #138pnshiralkar
2020-05-19Fixed view profile bug, closes #137pnshiralkar
2020-05-18Resolved merge conflictspnshiralkar
2020-05-18Fixed accept workshop without files bugpnshiralkar
2020-05-18Renamed model WorkshopComments to Comments and added hidden tag to the ↵pnshiralkar
non-public comments
2020-05-18Merge pull request #132 from pnshiralkar/add-edit-workshop-typesankitjavalkar
Add edit workshop types
2020-05-18Resolved merge conflictspnshiralkar
2020-05-18Resolved merge conflicts, Base.html nav links fixed, removed redundant print ↵pnshiralkar
statements
2020-05-18Merge pull request #134 from pnshiralkar/propose-ws-tncankitjavalkar
Propose workshop page terms and conditions
2020-05-14URL problems fixedpnshiralkar
2020-05-14Resolved merge conflictspnshiralkar
2020-05-14Resolved merge conflictspnshiralkar
2020-05-14Improved Adminsite view, changed CDN to static filespnshiralkar
2020-05-14Merged from revamov2pnshiralkar
2020-05-14Merge pull request #130 from pnshiralkar/split-workshops-viewankitjavalkar
Split my_workshops view
2020-05-13feat: CMS Apppnshiralkar
- Added cms app to INSTALLED_APPS in settings - Removed index URL from workshop_app/urls.py - Added cms urls to workshop_portal/urls.py - Added cms_base html for renderring cms - Modified static file model to save uploaded files into static location
2020-05-11Init cms app, added modelspnshiralkar
2020-05-09Added JS AJAX func to fetch tnc and modal to displaypnshiralkar
2020-05-09Added Get workshop_type_tnc APIpnshiralkar
2020-05-09Combined 2 document.ready funcspnshiralkar
2020-05-09Removed inline styling, optimized query in instructor view, removed ↵pnshiralkar
client_data variable in change_ws_date, optimized URL workshop_id regex
2020-05-07File delete donepnshiralkar
2020-05-07File upload donepnshiralkar
2020-05-07Add workshop types done without attachment filespnshiralkar
2020-05-06Added workshop comments, linked it to workshop_status tablespnshiralkar
2020-05-06Refractored workshopstatus viewspnshiralkar
2020-05-06Merge branch 'revampv2' of https://github.com/FOSSEE/workshop_booking into ↵pnshiralkar
split-workshops-view
2020-05-05Added is_instructor user checks for change date and accept viewspnshiralkar
2020-05-05Splitting my_workshop view donepnshiralkar
2020-05-05Workshop status view for instructor donepnshiralkar
2020-05-05My workshops view for coordinator donepnshiralkar
2020-05-04Merge pull request #129 from pnshiralkar/remove-recurrenceankitjavalkar
Removed recurrence dependency
2020-05-04Removed recurrence dependencypnshiralkar
generated by cgit (git 2.34.1) at 2024-12-20 13:54:59 +0000