Commits · 211336f0212707e6c955e4403ca6490a2762a010 · Fasilkom UI Open Source Software / Kape · GitLab

Fakultas Ilmu Komputer UI

28 Apr, 2017 1 commit
- [Refactor] [Post-Sprint-2] Fix conflict and deploying issues · 211336f0
  Zamil Majdy authored Apr 28, 2017
  
  211336f0
26 Apr, 2017 39 commits
- [Refactor] [Post-Sprint-2] Fix conflict and deploying issues · 26374945
  Zamil Majdy authored Apr 26, 2017
  
  26374945
- [Refactor] [Post-Sprint-2] Fix conflict and deploying issues · 5e518b8c
  Zamil Majdy authored Apr 26, 2017
  
  5e518b8c
- Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into develop · adf2c345
  M. Reza Qorib authored Apr 26, 2017
  
  adf2c345
- Bismillah Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1 into develop · 2ec7d73c
  M. Reza Qorib authored Apr 26, 2017
```
# Conflicts:
#	assets/css/custom.css
#	assets/js/components/VacancyList.jsx
#	assets/js/index.jsx
```
  2ec7d73c
- Final touch for sprint 2 · 1ba487e1
  Zamil Majdy authored Apr 26, 2017
  
  1ba487e1
- Merge branch 'Features/CompanyVacancyApplicationList' of... · f23f0f80
  M. Reza Qorib authored Apr 26, 2017
```
Merge branch 'Features/CompanyVacancyApplicationList' of https://gitlab.com/PPL2017csui/PPLA1 into develop
```
  f23f0f80
- Update applicancy status · 30b6238a
  M. Reza Qorib authored Apr 26, 2017
  
  30b6238a
- Add small touch on button · 25e2b756
  Zamil Majdy authored Apr 26, 2017
  
  25e2b756
- Add small touch on button · bad60279
  Zamil Majdy authored Apr 26, 2017
  
  bad60279
- Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into... · 5dac8617
  M. Reza Qorib authored Apr 26, 2017
```
Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into Features/CompanyVacancyApplicationList
```
  5dac8617
- [#140655219] [REFACTOR] #25 Improve test · 18f64d25
  M. Reza Qorib authored Apr 26, 2017
  
  18f64d25
- Merge ListingApplicants into userstory3 · 10054448
  Zamil Majdy authored Apr 26, 2017
  
  10054448
- [#140656091] [#33] [Refactor] Add transcript fetch · 0495fbed
  Zamil Majdy authored Apr 26, 2017
  
  0495fbed
- Merge branch 'Features/create-vacancy-company' into 'UserStory3' · 831a40e2
  Sirin Baisa authored Apr 26, 2017
```
[#21][#140652771] Page CRUD vacancy page

See merge request !11
```
  831a40e2
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into... · adc85050
  M. Reza Qorib authored Apr 26, 2017
```
Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/CompanyVacancyApplicationList
```
  adc85050
- [#140655219] [REFACTOR] #25 Refactor test code for ProfilePage · 2edfea00
  M. Reza Qorib authored Apr 26, 2017
  
  2edfea00
- [#140655219] [REFACTOR] #25 Finalize student profile page · d2914308
  M. Reza Qorib authored Apr 26, 2017
  
  d2914308
- Merge from StudentTranscript · 5a1097bd
  Zamil Majdy authored Apr 26, 2017
  
  5a1097bd
- [#140656091] [#33] [Refactor] Fixx css and add icon on application · ff4d6c37
  Zamil Majdy authored Apr 26, 2017
  
  ff4d6c37
- [#140656091] [#33] [Green] Add applicant and approve implementations · d502a5a4
  Zamil Majdy authored Apr 26, 2017
  
  d502a5a4
- [#140656091] [#33] [Red] Add applicant and approve test · e51ee2c8
  Zamil Majdy authored Apr 26, 2017
  
  e51ee2c8
- [#33] [#140655219] Transcript JS · 9c6a4670
  Farhan Farasdak authored Apr 26, 2017
  
  9c6a4670
- [REFACTOR] changed student's applied-vacancies list to also return the application · 5fe653a4
  Joshua Casey authored Apr 26, 2017
  
  5fe653a4
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage · 72aedee9
  M. Reza Qorib authored Apr 26, 2017
```
# Conflicts:
#	assets/css/custom.css
#	assets/js/index.jsx
```
  72aedee9
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ListingApplicants · 21f7d414
  Zamil Majdy authored Apr 26, 2017
```
# Conflicts:
#	assets/js/index.jsx
```
  21f7d414
- [#140655219] merge migrations · 136f3bab
  Joshua Casey authored Apr 26, 2017
  
  136f3bab
- [#140655219] #32 Added name on transcript api response · daeb2f29
  Joshua Casey authored Apr 26, 2017
  
  daeb2f29
- [#140655219] #32 Implemented student transcript scrapper · ed4ac06e
  Joshua Casey authored Apr 26, 2017
  
  ed4ac06e
- [#21] [#140652771] CRUD Vacancy Page Company · 099cb4d7
  sirinbaisa authored Apr 26, 2017
  
  099cb4d7
- Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1... · 5b209db2
  M. Reza Qorib authored Apr 26, 2017
```
Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage
```
  5b209db2
- fix little things, commit only to pull · d4d2ced1
  M. Reza Qorib authored Apr 26, 2017
  
  d4d2ced1
- Merge branch 'Features/react-routing' into 'UserStory3' · 5dd947d2
  Sirin Baisa authored Apr 25, 2017
```
Add role authentication handling on react router and passing user login data

See merge request !12
```
  5dd947d2
- Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1... · 3dd43778
  sirinbaisa authored Apr 26, 2017
```
Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage

# Conflicts:
#	assets/css/custom.css
#	assets/js/index.jsx
```
  3dd43778
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/react-routing · 5eb3f0cd
  M. Reza Qorib authored Apr 26, 2017
```
# Conflicts:
#	assets/js/components/VacancyList.jsx
```
  5eb3f0cd
- [#31 ] [#140652771] Page Profile Company · b114d77a
  sirinbaisa authored Apr 26, 2017
  
  b114d77a
- [#31][#140652771] Page Profile Company test · 7cde8f95
  sirinbaisa authored Apr 26, 2017
  
  7cde8f95
- [#140652771] #29 Fix testing error · c34d83ac
  M. Reza Qorib authored Apr 26, 2017
  
  c34d83ac
- Merge branch 'Features/CompanyVacancyApplicationList' of... · 7f88c0c4
  Joshua Casey authored Apr 26, 2017
```
Merge branch 'Features/CompanyVacancyApplicationList' of https://gitlab.com/PPL2017csui/PPLA1 into Features/StudentTranscript
```
  7f88c0c4
- Merge from develop to ProfilePage · b324f522
  M. Reza Qorib authored Apr 26, 2017
  
  b324f522

Excellence In Teamwork