Skip to content
This repository has been archived by the owner on Jul 28, 2018. It is now read-only.

merzhovanje #7

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
99871aa
zavrsen servis za api
dukadiesel Nov 21, 2017
03f361d
Merge pull request #4 from Dailoski/3-fetch-mods
ruzaivana Nov 21, 2017
5999b36
valjda ce sada da radi
dukadiesel Nov 21, 2017
9baccb9
fix
dukadiesel Nov 21, 2017
10d3f83
Merge branch 'master' into 2-login
Dailoski Nov 21, 2017
4feb61d
Merge pull request #8 from Dailoski/2-login
Dailoski Nov 21, 2017
51b391b
authenticaton service almost done
dukadiesel Nov 22, 2017
e40c137
3 i 7 zavrsen
dukadiesel Nov 22, 2017
afb7b0c
Merge pull request #9 from Dailoski/7-create-navigation
Dailoski Nov 22, 2017
43e15a5
Merge pull request #10 from Dailoski/6-authentication-service
ruzaivana Nov 22, 2017
e2e9676
komit brale
dukadiesel Nov 22, 2017
e6d7014
Style Change
dukadiesel Nov 23, 2017
b9f56f3
all done
dukadiesel Nov 23, 2017
de4edc6
Merge branch 'master' into 5-6-fixes
Dailoski Nov 23, 2017
bf7096d
Merge pull request #14 from Dailoski/5-6-fixes
Dailoski Nov 23, 2017
0a36b3f
Updating style (wip)
dukadiesel Nov 23, 2017
043009a
Fix style
dukadiesel Nov 23, 2017
87fec2a
Add sass-cache to gitignore
dukadiesel Nov 23, 2017
208c15c
Updated style
dukadiesel Nov 23, 2017
cdabe1f
Merge branch 'master' into style-update
Dailoski Nov 23, 2017
b35ce98
Merge pull request #15 from Dailoski/style-update
Dailoski Nov 23, 2017
0af9153
dataService BETA
dukadiesel Nov 23, 2017
616e856
Merge branch 'master' into 12-data-service
Dailoski Nov 23, 2017
e0844af
Merge pull request #16 from Dailoski/12-data-service
Dailoski Nov 23, 2017
6e31e9d
logout pro
dukadiesel Nov 23, 2017
45c0f9d
data service done
dukadiesel Nov 24, 2017
92f999f
Merge pull request #17 from Dailoski/12-data-service
Dailoski Nov 24, 2017
b1b23fe
few added things
dukadiesel Nov 24, 2017
d5c48d8
test
Nov 25, 2017
1d4274b
Merge pull request #21 from Dailoski/13-profile-page
Dailoski Nov 25, 2017
584cf86
bla
Nov 25, 2017
5164395
10 & 11 done
Nov 26, 2017
ca62fe5
people done
Nov 27, 2017
4e59c63
bla
dukadiesel Nov 27, 2017
59176ff
Merge pull request #22 from Dailoski/13-hot-fixes
Dailoski Nov 27, 2017
e81a3bc
CSS UPDATE
dukadiesel Nov 27, 2017
718b312
feed starter
dukadiesel Nov 27, 2017
028358f
Merge branch '14-feed' of https://github.com/Dailoski/BitBook into de…
dukadiesel Nov 28, 2017
76b4c92
Backup
dukadiesel Nov 28, 2017
879d97b
start
Nov 29, 2017
6bd4a3c
mare zavrsio nav
dukadiesel Nov 29, 2017
688e944
Merge pull request #23 from Dailoski/design-mare
Dailoski Nov 30, 2017
53d3dc3
profile-people-nav
CodeSeanPenn Nov 30, 2017
19a43a9
:
Dec 1, 2017
ffa8a8d
D day
dukadiesel Dec 1, 2017
fc1e7d9
Merge pull request #27 from Dailoski/people_profile
Dailoski Dec 1, 2017
17204ab
commit
dukadiesel Dec 1, 2017
493ca40
petak kraj
dukadiesel Dec 1, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
.sass-cache/
*.css.map
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
Loading