Commits · 5f81b0152e53654a8fff709d5eb964b6a9552e66 · Fasilkom UI Open Source Software / Kape

25 Apr, 2017 2 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
- [#140656091] #29 add authorization function · 6dc21553
  M. Reza Qorib authored Apr 25, 2017
  
  6dc21553
24 Apr, 2017 1 commit
- Check gitlab · 7ddad4b0
  Zamil Majdy authored Apr 24, 2017
  
  7ddad4b0
13 Apr, 2017 1 commit

Merge branch 'master' of https://gitlab.com/PPL2017csui/PPLA1 into develop · 65fba637

Zamil Majdy authored Apr 13, 2017

# Conflicts:
#	.gitignore
#	README.md
#	assets/js/index.js
#	core/templates/core/index.html
#	kape/settings.py
#	kape/urls.py
#	package.json
#	webpack.config.js

65fba637

10 Apr, 2017 5 commits
- Merge branch 'Personal/Zamil' into 'UserStory3' · b412ee34
  sirin authored Apr 10, 2017
```
JS fetch for upload from library

See merge request !4
```
  b412ee34
- [#140655219] Add object-assign · 65d0c67b
  Zamil Majdy authored Apr 10, 2017
  
  65d0c67b
- Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Personal/Zamil · 913bd92a
  Zamil Majdy authored Apr 10, 2017
  
  913bd92a
- [#140655219] Add ModalAlert (Add implementation) · 41507fac
  Zamil Majdy authored Apr 10, 2017
  
  41507fac
- [#140655219] Add ModalAlert (Add testcases) · 99a6d2b5
  Zamil Majdy authored Apr 10, 2017
  
  99a6d2b5
09 Apr, 2017 3 commits
- [#140655219] Refactor ModalAlert · 530f3cff
  Zamil Majdy authored Apr 09, 2017
  
  530f3cff
- Implement JS fetch for upload from library · b3f14087
  Zamil Majdy authored Apr 09, 2017
  
  b3f14087
- [#140655219] #20 Add test on new library methods · 3345a9cb
  Zamil Majdy authored Apr 09, 2017
  
  3345a9cb
30 Mar, 2017 2 commits
- Merge branch 'UserStory2' into 'develop' · 5c921954
  zamil majdy authored Mar 29, 2017
```
User story2

See merge request !1
```
  5c921954
- revised company register · dfc575b6
  Zamil Majdy authored Mar 30, 2017
  
  dfc575b6
29 Mar, 2017 17 commits
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 50b7c7cb
  M. Reza Qorib authored Mar 29, 2017
  
  50b7c7cb
- revised cancel application and tests · 753c45a1
  M. Reza Qorib authored Mar 29, 2017
  
  753c45a1
- revised test and added login behavior to company register · 507fc223
  Joshua Casey authored Mar 29, 2017
  
  507fc223
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 72e75100
  M. Reza Qorib authored Mar 29, 2017
  
  72e75100
- Update gitlabci · 28a2685f
  M. Reza Qorib authored Mar 29, 2017
  
  28a2685f
- Update gitlabci · fe037fdd
  M. Reza Qorib authored Mar 29, 2017
  
  fe037fdd
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 633c32fc
  M. Reza Qorib authored Mar 29, 2017
  
  633c32fc
- [#140654507] #4 update script · dec5bad6
  Zamil Majdy authored Mar 29, 2017
  
  dec5bad6
- [#140654507] #4 rename index · a853ae1f
  Zamil Majdy authored Mar 29, 2017
  
  a853ae1f
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 7871e58e
  M. Reza Qorib authored Mar 29, 2017
  
  7871e58e
- [#140654507] #12 on progress to make cancel applicancy · 4fe512fe
  M. Reza Qorib authored Mar 29, 2017
  
  4fe512fe
- [#140654507] #4 move python dependency · 7ed2b434
  Zamil Majdy authored Mar 29, 2017
  
  7ed2b434
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 999b9635
  Zamil Majdy authored Mar 29, 2017
```
# Conflicts:
#	assets/js/VacancyPage.jsx
```
  999b9635
- [#140654507] #13 Enable js logic for register company · 366417b0
  Zamil Majdy authored Mar 29, 2017
  
  366417b0
- [#140654507] #12 Refactor component name · dafdd8b5
  M. Reza Qorib authored Mar 29, 2017
  
  dafdd8b5
- [#140654507] #13 Refactor component name · b9ec122f
  M. Reza Qorib authored Mar 29, 2017
  
  b9ec122f
- [#140654507] #13 Add bookmark and cancel bookmark feature · e3e1abf9
  M. Reza Qorib authored Mar 29, 2017
  
  e3e1abf9
28 Mar, 2017 9 commits
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · a90f659f
  M. Reza Qorib authored Mar 28, 2017
  
  a90f659f
- sip sip sip · 26710e00
  M. Reza Qorib authored Mar 28, 2017
  
  26710e00
- [#140654507] #17 Page Modal Register · cd2d0c4a
  sirinbaisa authored Mar 28, 2017
  
  cd2d0c4a
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 4fc4fbf7
  sirinbaisa authored Mar 28, 2017
  
  4fc4fbf7
- [#140654507] #15 #16 update Modal for register · 1f7f29ef
  sirinbaisa authored Mar 28, 2017
  
  1f7f29ef
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · 6ad142f1
  M. Reza Qorib authored Mar 28, 2017
  
  6ad142f1
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · dc9f09b5
  M. Reza Qorib authored Mar 28, 2017
```
# Conflicts:
#	assets/js/components/ModalAlert.jsx
```
  dc9f09b5
- Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2 · cb2a31fa
  Joshua Casey authored Mar 28, 2017
  
  cb2a31fa
- [#140654507] #15 #16 Revised documentation and added testing for register · 3618cef0
  Joshua Casey authored Mar 28, 2017
  
  3618cef0