Commits · master · Science Computing / Scinage

19 Feb, 2021 2 commits
- Merge branch 'master' of git.uwaterloo.ca:science-computing/Scinage · c24951f0
  Troy Grandy authored Feb 19, 2021
  
  c24951f0
- fixed media modals in slide editor. · f85f8ebb
  Troy Grandy authored Feb 19, 2021
  
  f85f8ebb
20 Jan, 2021 2 commits
- Update views.py · 06c3d2a4
  Mirko Vucicevich authored Jan 20, 2021
  
  06c3d2a4
- Update views.py · 4f4ca4fc
  Mirko Vucicevich authored Jan 20, 2021
  
  4f4ca4fc
18 Jan, 2021 1 commit
- bug fixes. · fb27dacb
  Troy Grandy authored Jan 18, 2021
  
  fb27dacb
22 Dec, 2020 3 commits
- Merge branch 'master' of git.uwaterloo.ca:science-computing/Scinage · 80a3db87
  Mirko Vucicevich authored Dec 22, 2020
  
  80a3db87
- remove the used in slideshow list to speed things up · ae6c675f
  Mirko Vucicevich authored Dec 22, 2020
  
  ae6c675f
- More minor changes. · 913f009f
  Troy Grandy authored Dec 22, 2020
  
  913f009f
21 Dec, 2020 3 commits
- minor tweak. · 45b1d43f
  Troy Grandy authored Dec 21, 2020
  
  45b1d43f
- Fixed slide list for group slides. · a9c4d2d4
  Troy Grandy authored Dec 21, 2020
  
  a9c4d2d4
- css fixes. · 10e182fc
  Troy Grandy authored Dec 21, 2020
  
  10e182fc
18 Dec, 2020 3 commits
- scss fix maybe? · 73ad8f66
  Troy Grandy authored Dec 18, 2020
  
  73ad8f66
- Merge branch 'master' of git.uwaterloo.ca:science-computing/Scinage · 701172bb
  Mirko Vucicevich authored Dec 18, 2020
  
  701172bb
- ADFS working · 1453a279
  Mirko Vucicevich authored Dec 18, 2020
  
  1453a279
17 Dec, 2020 11 commits
- rejig settings · 91ea958d
  Mirko Vucicevich authored Dec 17, 2020
  
  91ea958d
- Merge branch 'master' of git.uwaterloo.ca:science-computing/Scinage · 079ee464
  Troy Grandy authored Dec 17, 2020
  
  079ee464
- moved to static. · 9a1d6d52
  Troy Grandy authored Dec 17, 2020
  
  9a1d6d52
- update more reqs for safety.. · 9ad006c4
  Mirko Vucicevich authored Dec 17, 2020
  
  9ad006c4
- Merge branch 'master' of git.uwaterloo.ca:science-computing/Scinage · dd8e0553
  Mirko Vucicevich authored Dec 17, 2020
  
  dd8e0553
- update reqs for safety · 6af53bcb
  Mirko Vucicevich authored Dec 17, 2020
  
  6af53bcb
- Fixed scroll bar issue...mostly. · 26369871
  Troy Grandy authored Dec 17, 2020
  
  26369871
- Add static url default · fb1960f1
  Mirko Vucicevich authored Dec 17, 2020
  
  fb1960f1
- fix settings_local · f2ea6383
  Mirko Vucicevich authored Dec 17, 2020
  
  f2ea6383
- fix requirements · 7d36729b
  Mirko Vucicevich authored Dec 17, 2020
  
  7d36729b
- cached changes · 32cb31c7
  Mirko Vucicevich authored Dec 17, 2020
  
  32cb31c7
26 Mar, 2020 15 commits
- Merge branch 'extended-widget-changelog' into 'master' · 2babe908
  Mirko Vucicevich authored Mar 26, 2020
```
Extended widget changelog

See merge request !61
```
  2babe908
- Revert "Merge branch 'master' into 'update-styles'" · ea254b98
  Stanley Huang authored Mar 26, 2020
```
This reverts commit 07a78d1d, reversing
changes made to fabe641d.
```
  ea254b98
- Merge branch 'use-production-vue' into 'master' · bc435477
  Mirko Vucicevich authored Mar 26, 2020
```
Use production vue + Bump Scinage version text to 3.0!!

See merge request !60
```
  bc435477
- Use production vue + Bump Scinage version text to 3.0!! · fbc36a46
  Stanley Huang authored Mar 26, 2020
  
  fbc36a46
- Merge branch 'slide-overlay' into 'master' · c52f149b
  Mirko Vucicevich authored Mar 26, 2020
```
Slide overlay

See merge request !59
```
  c52f149b
- Revert "Merge branch 'master' into 'update-styles'" · 43f09ff1
  Stanley Huang authored Mar 26, 2020
```
This reverts commit 07a78d1d, reversing
changes made to fabe641d.
```
  43f09ff1
- Merge branch 'AuthHotFix' into 'master' · 338576f5
  Mirko Vucicevich authored Mar 26, 2020
```
Hot Fix: Broken Auth

See merge request !58
```
  338576f5
- hot fix, auth broke due to the merge palooza · d41bce1e
  heoegema authored Mar 26, 2020
  
  d41bce1e
- Merge branch 'update-styles' into 'master' · d23fbabc
  Mirko Vucicevich authored Mar 26, 2020
```
Scinage Redesign

See merge request !57
```
  d23fbabc
- Revert "Merge branch 'master' into 'update-styles'" · b8e4f818
  Holly Elisabeth Oegema authored Mar 26, 2020
```
This reverts commit 07a78d1d, reversing
changes made to fabe641d.
```
  b8e4f818
- Merge branch 'default-404-page' into 'master' · ca635f38
  Mirko Vucicevich authored Mar 26, 2020
```
Add default 404 page

See merge request !54
```
  ca635f38
- Add default 404 page · 42041cb1
  Holly Elisabeth Oegema authored Mar 26, 2020
  
  42041cb1
- Merge branch 'no-slides-slideshow-error' into 'master' · 24d9bf15
  Mirko Vucicevich authored Mar 26, 2020
```
Better redirection for slideshows with no slides

See merge request !56
```
  24d9bf15
- Merge branch 'slide-editor' into 'master' · e5e662d5
  Mirko Vucicevich authored Mar 26, 2020
```
Autoselection and resize for slide creation.

See merge request !53
```
  e5e662d5
- Autoselection and resize for slide creation. · f287446e
  Holly Elisabeth Oegema authored Mar 26, 2020
  
  f287446e