Commits · 18f64d2536821a6d8272a37e73f670d614dffc61 · Fasilkom UI Open Source Software / Kape · GitLab

Fakultas Ilmu Komputer UI

26 Apr, 2017 17 commits
- [#140655219] [REFACTOR] #25 Improve test · 18f64d25
  M. Reza Qorib authored Apr 26, 2017
  
  18f64d25
- [#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 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
- [#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 from develop to ProfilePage · b324f522
  M. Reza Qorib authored Apr 26, 2017
  
  b324f522
- [#140652771] #29 Finalize react routing · 92a0fe86
  M. Reza Qorib authored Apr 26, 2017
  
  92a0fe86
- [#140656091] [Refactor] Heavily refactor vacancy related (efek merge userstory 4 :') · 0c8f31b6
  Zamil Majdy authored Apr 26, 2017
  
  0c8f31b6
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/react-routing · 1a17638c
  M. Reza Qorib authored Apr 26, 2017
```
# Conflicts:
#	assets/js/index.jsx
```
  1a17638c
25 Apr, 2017 13 commits
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/react-routing · 5f81b015
  M. Reza Qorib authored Apr 25, 2017
```
# Conflicts:
#	assets/js/index.jsx
```
  5f81b015
- Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory3 · b8438bad
  Zamil Majdy authored Apr 25, 2017
  
  b8438bad
- Merge branch 'UserStory4' into 'develop' · 51d5ea07
  Sirin Baisa authored Apr 25, 2017
```
User story4

See merge request !10
```
  51d5ea07
- Merge branch 'DeleteVacancyCompany' into 'UserStory4' · 99c3ecfa
  Reza Qorib authored Apr 25, 2017
```
Delete vacancy company

See merge request !9
```
  99c3ecfa
- [#140656091] #29 add authorization function · 6dc21553
  M. Reza Qorib authored Apr 25, 2017
  
  6dc21553
- [#140652771] [#21] [Green] Add delete vacancy implementation · 9aaede83
  Zamil Majdy authored Apr 25, 2017
  
  9aaede83
- [#140652771] [#21] [Red] Add delete vancancy testcases · 8d29ad34
  Zamil Majdy authored Apr 25, 2017
  
  8d29ad34
- [#140655219] [GREEN] #27 Implemented edit student profile API · 2eb2a094
  Joshua Casey authored Apr 25, 2017
  
  2eb2a094
- [#140652771] [#21] [Refactor] Delete unused file, unused import, refactor class name · 4d2d3c4d
  Zamil Majdy authored Apr 25, 2017
  
  4d2d3c4d
- Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1... · 3dbac2a5
  Joshua Casey authored Apr 25, 2017
```
Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage
```
  3dbac2a5
- [#140655219] [RED] #27 Remodel and test for edit profile API · 4664f0c9
  Joshua Casey authored Apr 25, 2017
  
  4664f0c9
- [#140655219] [REFACTOR] #25 Refactor Profile Page for accepting form changes · ad636870
  M. Reza Qorib authored Apr 25, 2017
  
  ad636870
- Merge branch 'Features/create-vacancy-company' into 'UserStory4' · 96885206
  zamil majdy authored Apr 25, 2017
```
Features/create vacancy company

See merge request !8
```
  96885206
24 Apr, 2017 10 commits
- [#140652771] [#21] [Refactor] Add logic to icon · 1ad20c9b
  Zamil Majdy authored Apr 24, 2017
  
  1ad20c9b
- Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1... · 0ae97fb2
  M. Reza Qorib authored Apr 24, 2017
```
Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage
```
  0ae97fb2
- [#140655219] [GREEN] #25 Refactor Profile Page for showing profile to self and companies · 87d5f682
  M. Reza Qorib authored Apr 24, 2017
  
  87d5f682
- [#23][#140652771] Tambahin icon verified · 968961c2
  sirinbaisa authored Apr 24, 2017
  
  968961c2
- Check gitlab · 7ddad4b0
  Zamil Majdy authored Apr 24, 2017
  
  7ddad4b0
- [#140652771] [#21] [Refactor] fix update vacancy bug + add testcases · 6299bee8
  Zamil Majdy authored Apr 24, 2017
  
  6299bee8
- Merge branch 'Features/CompanyVacancyApplicationList' of... · 74603581
  Zamil Majdy authored Apr 24, 2017
```
Merge branch 'Features/CompanyVacancyApplicationList' of https://gitlab.com/PPL2017csui/PPLA1 into Features/create-vacancy-company

# Conflicts:
#	core/tests/test_vacancies.py
```
  74603581
- [#140652771] [#21] [Refactor] update permission vacancy list · dacbced4
  Zamil Majdy authored Apr 24, 2017
  
  dacbced4
- [#140655219] #26 Revised permission to disallow company from accessing student list · 87d65d86
  Joshua Casey authored Apr 24, 2017
  
  87d65d86
- Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1... · 08ba0780
  M. Reza Qorib authored Apr 24, 2017
```
Merge branch 'Features/ProfilePage' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage
```
  08ba0780

Excellence In Teamwork