Commits · fe5b4aa6bcbe17a69e5057fd8cba393dd9cd1951 · Dean Krisitan Bardeloza / MIS21FinalsElection · GitLab

21 Jul, 2016 2 commits
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/deankristianb/MIS21FinalsElection · fe5b4aa6
  Dean Krisitan Bardeloza authored Jul 21, 2016
  
  fe5b4aa6
- added links to show for candidates · 3b5c25a4
  Dean Krisitan Bardeloza authored Jul 21, 2016
  
  3b5c25a4
20 Jul, 2016 4 commits
- Updated the theme for the website. · a9d2f745
  Alfonso Gabriel R. Arvisu authored Jul 20, 2016
  
  a9d2f745
- Added a background image to the page · 3df41415
  Alfonso Gabriel R. Arvisu authored Jul 20, 2016
  
  3df41415
- Added bootstrap to the stylesheets and made some aesthetic changes to some of the pages. · 35c6ea6f
  Alfonso Gabriel R. Arvisu authored Jul 20, 2016
  
  35c6ea6f
- added voting based on candidate id · 4ea169ae
  Kristoff Sison authored Jul 20, 2016
  
  4ea169ae
21 Jul, 2016 1 commit
- edited user profile · 4a293966
  Bianca Tarun authored Jul 21, 2016
  
  4a293966
20 Jul, 2016 4 commits
- added voting based on cadidate id · f07015a9
  Kristoff Sison authored Jul 20, 2016
  
  f07015a9
- edited votes controller · 5e8443b6
  Bianca Tarun authored Jul 20, 2016
  
  5e8443b6
- added party list feature · 2cc6b35b
  Bianca Tarun authored Jul 20, 2016
  
  2cc6b35b
- Modified show.html.erb for candidate views · bd423676
  Dean Krisitan Bardeloza authored Jul 20, 2016
  
  bd423676
19 Jul, 2016 2 commits
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/deankristianb/MIS21FinalsElection · 4013142a
  Kristoff Sison authored Jul 19, 2016
  
  4013142a
- added a Profile Edit page and pages for About and User · 2f546dba
  Kristoff Sison authored Jul 19, 2016
  
  2f546dba
20 Jul, 2016 6 commits
- edited seeds · efd7db55
  Bianca Tarun authored Jul 20, 2016
  
  efd7db55
- edited devise views · 9f59a0ac
  Bianca Tarun authored Jul 20, 2016
  
  9f59a0ac
- edited seed · ec804766
  Bianca Tarun authored Jul 20, 2016
  
  ec804766
- edited devise views and pages/index.html.erb and added columns to User · 1148912d
  Bianca Tarun authored Jul 20, 2016
  
  1148912d
- edited devise views · 8855477e
  Bianca Tarun authored Jul 20, 2016
  
  8855477e
- fixed candidates index page · 21d19466
  Bianca Tarun authored Jul 20, 2016
  
  21d19466
19 Jul, 2016 2 commits
- added views, modified controller for votes · ad30be84
  Dean Krisitan Bardeloza authored Jul 19, 2016
  
  ad30be84
- Created a Votes page · db7fe67b
  Alfonso Gabriel R. Arvisu authored Jul 19, 2016
  
  db7fe67b
20 Jul, 2016 1 commit
- fixed position simple form · 670ee722
  Bianca Tarun authored Jul 20, 2016
  
  670ee722
19 Jul, 2016 1 commit
- Added a line of code to candidates_controller in order for an admin to edit the candidate. · ca6be502
  Alfonso Gabriel R. Arvisu authored Jul 19, 2016
  
  ca6be502
18 Jul, 2016 9 commits
- modified show for candidates, can now show name, slogan, and voters(number of voters in progress) · fc99cc9e
  Dean Krisitan Bardeloza authored Jul 18, 2016
  
  fc99cc9e
- fixed wording inconsistencies · 1eaf9d2d
  Kristoff Sison authored Jul 18, 2016
  
  1eaf9d2d
- Added a candidates page under views\admin\candidates and edited the layout · 8ef422dd
  Alfonso Gabriel R. Arvisu authored Jul 18, 2016
  
  8ef422dd
- Added 3 Positions: President, Vice President & Senator · 932a32f9
  Alfonso Gabriel R. Arvisu authored Jul 18, 2016
  
  932a32f9
- added candidates_controller · 655ba07d
  Bianca Tarun authored Jul 18, 2016
  
  655ba07d
- added admin positions controller and corresponding html · 1cf66a18
  Bianca Tarun authored Jul 18, 2016
  
  1cf66a18
- edited models and added foreign keys · b131b536
  Bianca Tarun authored Jul 18, 2016
  
  b131b536
- Added CandidatesControler, VotesController, Vote model and edited Candidate... · aa32fd71
  Bianca Tarun authored Jul 18, 2016
```
Added CandidatesControler, VotesController, Vote model and edited Candidate model, User model, Vote model
```
  aa32fd71
- Added CandidatesController, Vote model, edited Candidate, User, Vote model · b4c2dc98
  Bianca Tarun authored Jul 18, 2016
  
  b4c2dc98
17 Jul, 2016 3 commits
- Added positions_controller and views\positions\show.html.erb; Updated... · 23be063f
  Alfonso Gabriel R. Arvisu authored Jul 17, 2016
```
Added positions_controller and views\positions\show.html.erb; Updated views\layouts\application.html.erb.
```
  23be063f
- Added pages_controller and index.html.erb for views/pages · cf427e63
  Alfonso Gabriel R. Arvisu authored Jul 17, 2016
  
  cf427e63
- generated model for user, candidate, position. installed gems added routes for... · 4003bdcf
  Dean Krisitan Bardeloza authored Jul 17, 2016
```
generated model for user, candidate, position. installed gems added routes for candidate and position.
```
  4003bdcf