Charlie Chiu
|
f9626c7218
|
Merge branch 'master' into ads_2
|
7 years ago |
Charlie Chiu
|
3bc67f4969
|
ads page by charlie
|
7 years ago |
francesca6431
|
de965a8b0a
|
Merge pull request #8 from ExtProjNomit/comp-ads_1-referee
Comp ads 1 referee
|
7 years ago |
Francesca Sperati
|
40c67733c5
|
companies, ads_1, referee pages
|
7 years ago |
Francesca Sperati
|
27526c5587
|
companies, ads_1, referee pages
|
7 years ago |
Mohammed Tantawy
|
225cb637c2
|
Merge pull request #7 from ExtProjNomit/ui-page_users
Ui page users
|
7 years ago |
Mohammed Tantawy
|
0b52ffe6a7
|
Merge pull request #6 from ExtProjNomit/master
implementation of users.html page
|
7 years ago |
Francesca Sperati
|
1fe9cfa277
|
implementation of page users.html
|
7 years ago |
Davide Bragagnolo
|
0adceb1fad
|
Merge pull request #5 from ExtProjNomit/ui-parts-and-page_ads
ads page completed + fixed conflict with forms.html
|
7 years ago |
Francesca Sperati
|
2d397cac95
|
fixed conflict with forms.html
|
7 years ago |
Francesca Sperati
|
4b820f17e8
|
ads page completed
|
7 years ago |
francesca6431
|
7a3319aa0e
|
Merge pull request #4 from ExtProjNomit/ui-parts-and-page_ads
split the top and side bars into files (html _loadert), start ads.htm…
|
7 years ago |
Francesca Sperati
|
7ae73f1683
|
fix the logos code
|
7 years ago |
Francesca Sperati
|
8ae0219a33
|
split the top and side bars into files (html _loadert), start ads.html template
|
7 years ago |
Mohammed Tantawy
|
aac1c6c91c
|
Merge pull request #3 from ExtProjNomit/user-form
User form
|
7 years ago |
Mohammed Tantawy
|
c135e2fdb0
|
missing bracket in server.js
|
7 years ago |
Mohammed Tantawy
|
0b333c8790
|
Added user form
Added user form script
Updated imports of index
TODO: Visa still hardcoded, needs DB
|
7 years ago |
Charlie Chiu
|
148d1d8f20
|
Merge pull request #2 from ExtProjNomit/color-fonts-update
Updated color and font system
|
7 years ago |
Charlie Chiu
|
b044137351
|
Updated color and font system
|
7 years ago |
Mohammed Tantawy
|
0e263a1ee6
|
Merge pull request #1 from ExtProjNomit/ui-index-1
Ui index 1
|
7 years ago |
Davide Bragagnolo
|
d5a4e2f3c0
|
Merge branch 'master' into ui-index-1
|
7 years ago |
Francesca Sperati
|
bb758ed116
|
adjusting size of boxes
|
7 years ago |
Francesca Sperati
|
6b90799b4e
|
autodeploy
|
7 years ago |
Francesca Sperati
|
315f8fbea2
|
just a test
|
7 years ago |
Francesca Sperati
|
c36cc3c62b
|
ui index - francesca
|
7 years ago |
Davide
|
75f2d6134f
|
fixed npm dependecies for heroku
|
7 years ago |
Davide
|
8dbf5d5dd3
|
added server.js and fixed "npm start" script for heroku deployment
|
7 years ago |
Francesca Sperati
|
cac49df6c4
|
testing branching
|
7 years ago |
Aigars Silkalns
|
987c278fb8
|
Merge pull request #134 from chanyou0311/fix/readme-typo
Fix typo in README.md
|
7 years ago |
chanyou0311
|
a423fb2474
|
Fix typo
|
7 years ago |
Aigars Silkalns
|
a8ae681167
|
Update README.md
|
7 years ago |
Aigars Silkalns
|
e7e1efe86f
|
Merge pull request #115 from chriskuech/master
Update README.md
|
7 years ago |
Chris Kuech
|
4416cc7631
|
Update README.md
|
7 years ago |
Aigars Silkalns
|
14027166f5
|
Merge pull request #87 from Sibiraj-S/patch-1
docs: update nav links
|
8 years ago |
Sibiraj
|
88bc90a157
|
docs: update nav links
|
8 years ago |
Aigars Silkalns
|
2cf94284b1
|
Merge pull request #75 from krzysiekpiasecki/master
Add ISSUE_TEMPLATE
|
8 years ago |
Krzysztof Piasecki
|
d780fe3c49
|
Change submit type order and add the comment
|
8 years ago |
Krzysztof Piasecki
|
6eec1f6fbf
|
Update ISSUE_TEMPLATE.md
|
8 years ago |
Krzysztof Piasecki
|
a196f8123e
|
Add ISSUE_TEMPLATE.md
|
8 years ago |
Aigars Silkalns
|
0cafd8e9da
|
Merge pull request #66 from krzysiekpiasecki/issue-65
Display none when spinner inactive
|
8 years ago |
Krzysztof Piasecki
|
fad4dba425
|
Dont display spinner when off
|
8 years ago |
Aigars Silkalns
|
73ebabeb64
|
Merge pull request #64 from krzysiekpiasecki/issue-#55
Add datepicker form control to forms.html
|
8 years ago |
Aigars Silkalns
|
0e6d733f14
|
Merge pull request #63 from krzysiekpiasecki/issue-#61
Rename blank page to Blank and fix navbar height
|
8 years ago |
Krzysztof Piasecki
|
b7e98ac123
|
Fix navbar height
|
8 years ago |
Krzysztof Piasecki
|
da654c2813
|
Add datepicker form control to forms.html
|
8 years ago |
Krzysztof Piasecki
|
5ada3c877e
|
Rename blank page to Blank
|
8 years ago |
Aigars Silkalns
|
2c46a299d3
|
Merge pull request #53 from filipkrstic/master
Added missing div closing tag
|
8 years ago |
Filip Krstic
|
1689c65c29
|
Added missing div closing tag
W3 validator reported open element. This change fixed it.
|
8 years ago |
Filip Krstic
|
2cfd6f773e
|
Added missing div closing tag
W3 validator reported open element. This change fixed it.
|
8 years ago |
Aigars Silkalns
|
54fcedc833
|
Merge pull request #52 from krzysiekpiasecki/master
Add blank page
|
8 years ago |