summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-07-29Merge pull request #154 from FOSSEE/fix_cmsPalaparthy Adityachandra
2020-07-29Merge pull request #156 from CruiseDevice/revampv2Akash Chavan
2020-07-28Add a check if json dump existsCruiseDevice
2020-07-28Workshop app migrationsCruiseDevice
2020-07-27Change project filesadityacp
2020-07-27Change workshop_app filesadityacp
2020-07-27Change design and url patternsadityacp
2020-07-27Change models, views, admin, templateadityacp
2020-07-27Delete unnecessary static filesadityacp
2020-07-21Get latest changes and resolve conflictsadityacp
2020-07-01Merge pull request #153 from FOSSEE/revampv2Palaparthy Adityachandra
2020-07-01Merge branch 'revampv2' of https://github.com/FOSSEE/workshop_booking into re...adityacp
2020-07-01Change views, models, settings, urlsadityacp
2020-07-01Change templatesadityacp
2020-06-30Merge pull request #144 from pnshiralkar/messagesPalaparthy Adityachandra
2020-06-30Merge pull request #139 from pnshiralkar/fix-profile-pagePalaparthy Adityachandra
2020-06-27Merge branch 'messages' of https://github.com/pnshiralkar/workshop_booking in...adityacp
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 fi...pnshiralkar
2020-05-29Merge pull request #142 from pnshiralkar/replace-cdnankitjavalkar
2020-05-28Merge pull request #140 from pnshiralkar/fix-footer-tnc-modal-close-btnankitjavalkar
2020-05-28Solved merge conflictspnshiralkar
2020-05-22Replaced CDN with local filespnshiralkar
2020-05-21Merge pull request #131 from pnshiralkar/workshop-commentsankitjavalkar
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 non-pu...pnshiralkar
2020-05-18Merge pull request #132 from pnshiralkar/add-edit-workshop-typesankitjavalkar
2020-05-18Resolved merge conflictspnshiralkar
2020-05-18Resolved merge conflicts, Base.html nav links fixed, removed redundant print ...pnshiralkar
2020-05-18Merge pull request #134 from pnshiralkar/propose-ws-tncankitjavalkar
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
2020-05-13feat: CMS Apppnshiralkar
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 client_da...pnshiralkar
2020-05-07File delete donepnshiralkar
2020-05-07File upload donepnshiralkar
2020-05-07Add workshop types done without attachment filespnshiralkar