summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-15Merge pull request #159 from FOSSEE/add_profile_featuresPalaparthy Adityachandra
Add edit profile and change password
2020-08-15Add edit profile and change passwordadityacp
2020-08-15Merge pull request #158 from FOSSEE/fix_statsPalaparthy Adityachandra
Fix statistics app
2020-08-14Remove unnecessary importsadityacp
2020-08-14Add download statistics optionadityacp
2020-08-13Add string representation in teams modeladityacp
2020-08-13Fix and refactor statistics appadityacp
2020-08-13Multiple Changesadityacp
- Fix admin csv download for profile and workshops - Add model manager to get workshops by state and type - Add chartjs, jquery-ui in base.html
2020-08-13Fix login_url in settings and statistics in urlsadityacp
2020-08-13Add pandas to the requirementsadityacp
2020-08-05Merge pull request #157 from FOSSEE/fix_issuesPalaparthy Adityachandra
Multiple fixes
2020-07-31Multiple fixesadityacp
- Fix urls in activation.html - Add form error in login.html - Fix ajax url in propose_workshop.html - Delete the workshop attachment on the disk - Add media url in project urls
2020-07-29Merge pull request #154 from FOSSEE/fix_cmsPalaparthy Adityachandra
Fix CMS app
2020-07-29Merge pull request #156 from CruiseDevice/revampv2Akash Chavan
Workshop app migrations
2020-07-28Add a check if json dump existsCruiseDevice
2020-07-28Workshop app migrationsCruiseDevice
- Pushing all the migrations related to the workshop_app. - Created new migrations to adjust with the updated db schema. - Add .sampleenv file. - Add updated settings.py
2020-07-27Change project filesadityacp
- Add project views to redirect to the cms home page if available - Add home page title variable in the settings - Change initial reg ex url pattern for the app urls
2020-07-27Change workshop_app filesadityacp
- Add app_name in workshop_app urls - Change redirect reverse url accoriding to app name - Change urls in email messages
2020-07-27Change design and url patternsadityacp
2020-07-27Change models, views, admin, templateadityacp
- Add active boolean field in all models - Get the pages based on the active status - Minor code refactor in views - Add app_name in urls
2020-07-27Delete unnecessary static filesadityacp
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
generated by cgit (git 2.34.1) at 2024-12-23 00:10:46 +0000