Merged - #8

Open

sobies93 wants to merge 64 commits into

Commits on Jun 24, 2015

Revert "nazwa"
mmanski
committed
1fa8cf8

Commits on Nov 14, 2015

jhipster stack switch
mmanski
committed
5932c37

Commits on Nov 16, 2015

landing page responsivity fix
sobies93
committed
c2fb323

Commits on Dec 7, 2015

frontend Skeleton
sobies93
committed
725ddf7

Commits on Dec 8, 2015

calculating
sobies93
committed
b9729b1

Commits on Dec 10, 2015

enitities .json
sobies93
committed
df2091f
correction
sobies93
committed
f2c282c
entities correction
sobies93
committed
72ebf79
entities common files
sobies93
committed
b983ea0
entiteis generated
sobies93
committed
baf1185

Commits on Dec 11, 2015

Commits on Dec 14, 2015

marta
marta
committed
fb02607
cleaned index.html
marta
committed
147642e

Commits on Dec 15, 2015

update front-end
marta
committed
f6555d2

Commits on Dec 16, 2015

amchart removing
marta
committed
b934251
calculation partly done
sobies93
committed
6e0d1bb
password restored
marta
committed
24c5dff
removing unused dependency, add developer settings to git ignore
sobies93
committed
5a25c10
Merge branch 'frontendSkeleton' of https://github.com/mmanski/Cabzza into frontendSkeleton
sobies93
committed
5e27c38

Commits on Dec 20, 2015

Merge branch 'jhipster-stack-switch' into 'origin/frontendSkeleton'
sobies93
committed
24ac092
removed bower components
sobies93
committed
fe3e0b8
making it work
sobies93
committed
6b59e50

Commits on Dec 28, 2015

add node_modules and bower_components to gitignore
sobies93
committed
05c2944
step 1-2 validation
sobies93
committed
1181051
Merge branch 'develop' into merged
sobies93
committed
4be7e99
step 3 validation
sobies93
committed
e8ef266
Merge branch 'frontendSkeleton' of https://github.com/mmanski/Cabzza into calculation
sobies93
committed
862e6d1
logo duplication removing
sobies93
committed
474719e

Commits on Jan 3, 2016

Merge branch 'calculation' into merged
sobies93
committed
031a5f6
merge correction
sobies93
committed
a17e801
style to projectList.html @mobile, change table objects to normal divs
marta
committed
a941363

Commits on Jan 4, 2016

style to #steps desktop, style to project view desktop
marta
committed
1316ff6

Commits on Jan 5, 2016

style to steps mobile, style to login, register, recover, add content
marta
committed
800985b

Commits on Jan 6, 2016

project generation
sobies93
committed
d7d8f4f
Merge branch 'merged' of https://github.com/mmanski/Cabzza into merged
sobies93
committed
3d7f840
merge correction
sobies93
committed
24b1843

Commits on Jan 7, 2016

frontend side of wallet creation finished
sobies93
committed
f3fb20c
Restored psql password
mmanski
committed
8ed6390
Liquibase props fixed
mmanski
committed
a9c4ea0
Added maven tomcat7 plugin to the pom.xml
mmanski
committed
2b7eaa3
Fixed pom deps order
mmanski
committed
109bcb4
Fixed war filename in pom.xml
mmanski
committed
a4469a9
Fixed typo in pom.xml
mmanski
committed
1e92be6
final style
marta
committed
9d8334d
calculation pretested version
sobies93
committed
6595ffb
Merge branch 'merged' of https://github.com/mmanski/Cabzza into merged
sobies93
committed
52aaae9

Commits on Jan 8, 2016

valid calculation with no saving data
sobies93
committed
f0d02f7
Added dynamic data fetching mechanism and support for sending emails
mmanski
committed
a5c3b29
Merge branch 'merged' of https://github.com/RasGrass/Cabzza into merged
mmanski
committed
e0f8c6d
fixed uncompilable code
mmanski
committed
8d37883
removed password
mmanski
committed
9bb1905
calculation finished
sobies93
committed
ccfaad3
Merge branch 'merged' of https://github.com/mmanski/Cabzza into merged
sobies93
committed
8765fe9
scientific mode
sobies93
committed
d88470c
minor change sc mode
sobies93
committed
08f62ca
Added symbol lookup
mmanski
committed
0b97773
merge
mmanski
committed
cb48301
hotfix
mmanski
committed
e95d94d
Revert "merge"
sobies93
committed
f398c27
hot fix
sobies93
committed
737b502