Merge pull request #215 from Katharineum/dev
Merge devs
No related branches found
No related tags found
Showing
- .gitignore 6 additions, 3 deletions.gitignore
- .idea/dataSources.local.xml 0 additions, 17 deletions.idea/dataSources.local.xml
- .idea/dataSources.xml 0 additions, 53 deletions.idea/dataSources.xml
- .idea/dataSources/ae145b31-953d-4d55-ad07-b49b3287f618.xml 0 additions, 8703 deletions.idea/dataSources/ae145b31-953d-4d55-ad07-b49b3287f618.xml
- .idea/dataSources/ea4cff78-5949-410f-aa64-d6daa5fb293d.xml 0 additions, 1777 deletions.idea/dataSources/ea4cff78-5949-410f-aa64-d6daa5fb293d.xml
- .idea/dataSources/ef6730d6-e849-4772-acac-62469acab4d2.xml 0 additions, 1711 deletions.idea/dataSources/ef6730d6-e849-4772-acac-62469acab4d2.xml
- .idea/jsLibraryMappings.xml 0 additions, 6 deletions.idea/jsLibraryMappings.xml
- .idea/misc.xml 0 additions, 7 deletions.idea/misc.xml
- .idea/modules.xml 0 additions, 0 deletions.idea/modules.xml
- .idea/school-apps.iml 22 additions, 10 deletions.idea/school-apps.iml
- .idea/vcs.xml 1 addition, 1 deletion.idea/vcs.xml
- .idea/webResources.xml 0 additions, 0 deletions.idea/webResources.xml
- README.md 48 additions, 47 deletionsREADME.md
- dynselect/bundle.js 0 additions, 0 deletionsdynselect/bundle.js
- dynselect/src/App.js 81 additions, 82 deletionsdynselect/src/App.js
- dynselect2/src/App.js 224 additions, 436 deletionsdynselect2/src/App.js
- requirements.txt 11 additions, 0 deletionsrequirements.txt
- schoolapps/LDAP-groups-et-al.patch 0 additions, 104 deletionsschoolapps/LDAP-groups-et-al.patch
- schoolapps/aub/filters.py 11 additions, 8 deletionsschoolapps/aub/filters.py
- schoolapps/aub/migrations/0001_initial.py 21 additions, 14 deletionsschoolapps/aub/migrations/0001_initial.py
Loading
Please register or sign in to comment