Commits · c61357d2e7905126eca44db5f8971f9844a85c6f · thalia / ThaliApp

01 Jun, 2017 6 commits
- finishing touches on styling login, done · c61357d2
  AuckeBos authored May 31, 2017
  
  c61357d2
- Login screen: logo added, login working. · c9c6c177
  AuckeBos authored May 10, 2017
  
  c9c6c177
- Changed background color, added 'password reset' support (opening link on click) · 53a08e95
  AuckeBos authored May 03, 2017
  
  53a08e95
- Background, inputs, buttons set · 474841f3
  AuckeBos authored May 03, 2017
  
  474841f3
- Merge branch 'new-docker-image' into 'master' · 387eafb9
  Wietse Kuipers authored Jun 01, 2017
```
New docker image/Tests

See merge request !31
```
  387eafb9
- Attempt to build android app · e7729112
  Wietse Kuipers authored May 31, 2017
  
  e7729112
31 May, 2017 10 commits
- switch to new image · e64be6d8
  Wietse Kuipers authored May 16, 2017
  
  e64be6d8
- Merge branch 'feature/calendar-style' into 'master' · 474d2c3a
  Wietse Kuipers authored May 31, 2017
```
Add styling for calendar

See merge request !23
```
  474d2c3a
- Fix multi-day events being rendered wrong · 8052bdbc
  Wietse Kuipers authored May 31, 2017
  
  8052bdbc
- Added support for events spanning multiple days and used Moment instead of Date · aaa23233
  Gijs Hendriksen authored May 27, 2017
  
  aaa23233
- Changed some styling details · 82cedaaa
  Gijs Hendriksen authored May 26, 2017
  
  82cedaaa
- Added pull to refresh, fixed list height · d0999bc8
  Gijs Hendriksen authored May 26, 2017
  
  d0999bc8
- Added styling for calendar · 739a3e42
  Gijs Hendriksen authored May 26, 2017
  
  739a3e42
- Merge branch 'feature/event-details' into 'master' · 5db69856
  Wietse Kuipers authored May 31, 2017
```
Event details styling

See merge request !22
```
  5db69856
- Fix missing event.user_registration !== null check · 8865f022
  Sébastiaan Versteeg authored May 31, 2017
  
  8865f022
- Merge branch 'fix/sidebar-styling' into 'master' · a9919c64
  Wietse Kuipers authored May 31, 2017
```
Fix sidebar styling

See merge request !29
```
  a9919c64
29 May, 2017 1 commit
- Fix sidebar styling · cdf9d7f0
  Sébastiaan Versteeg authored May 29, 2017
  
  cdf9d7f0
28 May, 2017 3 commits
- Change info text in event details · 96c74d44
  Sébastiaan Versteeg authored May 28, 2017
  
  96c74d44
- Fix grid keys by using string concat · a7a7d79d
  Sébastiaan Versteeg authored May 28, 2017
  
  a7a7d79d
- Only show registrations with registered status in event detail · 0c376fae
  Sébastiaan Versteeg authored May 28, 2017
  
  0c376fae
27 May, 2017 15 commits
- Merge branch 'login-code-cleanup' into 'master' · 3102315b
  Gijs Hendriksen authored May 27, 2017
```
Small code fixes in login actions/reducers

See merge request !24
```
  3102315b
- Merge branch 'feature/icon-splashscreen' into 'master' · 490f83c7
  Wietse Kuipers authored May 27, 2017
```
Add icon for Android/iOS and splashscreen for iOS

See merge request !27
```
  490f83c7
- Add icon for Android/iOS and splashscreen for iOS · 52e1e3f2
  Sébastiaan Versteeg authored May 27, 2017
  
  52e1e3f2
- Fix registration networking and styling on iOS · 58193eb0
  Sébastiaan Versteeg authored May 27, 2017
  
  58193eb0
- Add iOS font styling · 892baf25
  Sébastiaan Versteeg authored May 27, 2017
  
  892baf25
- Add gradient to MemberView · 16b368e6
  Sébastiaan Versteeg authored May 27, 2017
  
  16b368e6
- Add comment explaining registrations mapping · 6d845eac
  Sébastiaan Versteeg authored May 27, 2017
  
  6d845eac
- Load registrations if necessary before opening event · 03d99a04
  Sébastiaan Versteeg authored May 27, 2017
  
  03d99a04
- Fix children not having keys in map · 7327c4cb
  Sébastiaan Versteeg authored May 27, 2017
  
  7327c4cb
- Add registrations to event detail · 8368f1ef
  Sébastiaan Versteeg authored May 26, 2017
  
  8368f1ef
- Add location image and fix problem when max participants is null · 80dcd3f8
  Sébastiaan Versteeg authored May 26, 2017
  
  80dcd3f8
- Style event details · 18d5e970
  Sébastiaan Versteeg authored May 26, 2017
  
  18d5e970
- Merge branch 'fix/xcode-build' into 'master' · a3e13831
  Wietse Kuipers authored May 27, 2017
```
Fix XCode build

See merge request !25
```
  a3e13831
- Fix XCode build · ae7af6d9
  Sébastiaan Versteeg authored May 27, 2017
  
  ae7af6d9
- Small code fixes in login actions/reducers · bbdc2173
  Wietse Kuipers authored May 27, 2017
  
  bbdc2173
26 May, 2017 5 commits
- Merge branch 'feature/sidebar-gradient' into 'master' · e43a69c9
  Gijs Hendriksen authored May 26, 2017
```
Add gradient view and style drawer header

See merge request !18
```
  e43a69c9
- Merge branch 'feature/new-api-urls' into 'master' · f3d5ebcd
  Gijs Hendriksen authored May 26, 2017
```
Change event API urls

See merge request !15
```
  f3d5ebcd
- Fixed member url · b77c5a56
  Gijs Hendriksen authored May 26, 2017
  
  b77c5a56
- Add gradient view and style drawer header · ee41134d
  Sébastiaan Versteeg authored May 25, 2017
  
  ee41134d
- Merge branch 'fix/navigation' into 'master' · 0ee91cf1
  Sébastiaan Versteeg authored May 26, 2017
```
Fixed some navigation issues

See merge request !20
```
  0ee91cf1