|
fa8c79dc
|
Update README.md
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
cb1d415a
|
Update CHANGELOG.md
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
63be8b7b
|
Created changelog
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
01d970c1
|
merge
Need to commit to checkout master
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
9180e466
|
merge
Need to commit to checkout master
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
ce8be8fd
|
Revert back after presentation
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
5d22a223
|
QUestions
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
19e36f1b
|
Whatever
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
fbf17da3
|
merge
Merge branch 'feat-interactive-participation' of github.com:jacquesd/ASQ into...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
b49bcc4f
|
video
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
1052729d
|
Prevented user sign up and login for demo
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
3fe4006e
|
Fixing quotes
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
c8e4ac3e
|
Improving slides
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
1b8b7d8d
|
Forgot comma in questions.json
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
72d95d7a
|
Added nb of followers and made slideshow for tomorrow
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
6ad148e1
|
meny fixes
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
30c72aea
|
Fixed bug when no answer for given question
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
aa127932
|
Working on stats with Max: Bug fixing
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
aae85abf
|
merge
Merge branch 'feat-answer-stats' into feat-interactive-participation
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
71ec2339
|
Trying to fix m4 bugs...
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
f52b9902
|
more stats
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
d9469afd
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
b2e243c1
|
Remove sock auth 2
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
4d059c18
|
Remove sock auth
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
de9056e8
|
merge
Merged
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
36af8de5
|
Ready to merge
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
68dc9518
|
Removed bootstrap-modal
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
b8f56e6d
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
faa573a8
|
Statistics
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
b6bfe45c
|
Fixed dual modal bug again... ?
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
057cf0f7
|
Fixed range call stack error
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
7c653c52
|
Fixed multiple modal bug and other bugs
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
88f8ce4a
|
Minor changes
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
8ab96289
|
merge
Working socket auth
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
fce95034
|
Remove unecessary socket.io reference
|
Vasileios Triglianos <t****n@g****m>
|
over 13 years ago
|
|
|
b6ca7247
|
Working update of participation when user clicks modify answer.
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
1509194c
|
Add socket authentication
|
Vasileios Triglianos <t****n@g****m>
|
over 13 years ago
|
|
|
f78dc6f9
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
474a69f4
|
Added db query on resubmitt event and fix number of viewers displayed
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
776508ca
|
Bugfixes
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
bb658f56
|
Editing questions
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
d9c22479
|
Added connection limit on sockets and display on clients.
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
aff0c3f2
|
Added new stats file
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
9df46a7d
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
04b51ada
|
Removed some of the links
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
73b00c69
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
e806f10a
|
Added menu
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
624b4a9e
|
Edit html works
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
0fa6a7d0
|
Add remove options
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
f7830d7c
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
d767c43b
|
Minor changes
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
0f62adaf
|
Change answer stuff
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
296d4ead
|
merge
Merged with max
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
f0eea2a9
|
Redfined websocket submit event.
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
20c0e105
|
Bug fixes, progress bar, ...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
62bfdf9d
|
Fixed bug in stats genration/display with max
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
90e127a3
|
merge
Merged with max and refiexed the bug where the question is not shown after fi...
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
6aa83999
|
Merged maxs work for showing answer popup
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
a668ba90
|
Merged Margaritas socket submit function and modified goto to ignor event wil...
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
9d665114
|
merge
Merge branch 'feat-answer-stats' of github.com:jacquesd/ASQ into feat-answer-...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
a0d6c32d
|
Improved websockets
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
8684a3df
|
Small changes
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
47f71023
|
Answers try
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
b0009b2c
|
Max please correct me
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
374d326d
|
merge
Sends answers to server again
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
407fbd1e
|
Sends answers to server
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
78255f38
|
Added equal answers stats, removed Sample answers
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
187e60bc
|
test new branch
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
d5294bf3
|
merge
Merged with Max
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
22c92079
|
Will take working branch
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
515e8b85
|
Display stats popups from max & code cleaning
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
eb825cff
|
merge
Merge branch 'feat-question-pop' into feat-slideshow-handling
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
c8ec0875
|
Separated the goto function
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
d923eaab
|
Jacques please fix me
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
1568b861
|
merge
Merge branch 'feat-question-pop' of github.com:jacquesd/ASQ into feat-questio...
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
1f89dedc
|
Ready to take max work
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
7787e36e
|
merge
Merge branch 'feat-question-pop' of github.com:jacquesd/ASQ into feat-questio...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
227d0e0d
|
more beautiful stats
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
55ad7373
|
merge
Merge branch 'feat-slideshow-handling' into feat-question-pop
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
aab989e4
|
Code cleaning
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
c281d378
|
Ready to take jacques s soul
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
a41baecf
|
merge
Merge branch 'feat-question-pop' of github.com:jacquesd/ASQ into feat-questio...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
ef43e75a
|
Stats are displayed
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
b049eced
|
Fixed bug where first slide was not set as activeSlide
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
278ea1f0
|
Questions pops out without answer
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
aaf249a7
|
merge
Merge branch 'feat-slideshow-handling' into feat-question-pop
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
4dc18d4b
|
merge
Taking final Jacques version
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
db6168ad
|
Each question displayed only once and bug fix.
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
1a966c7c
|
merge
Merge branch 'feat-question-pop' of github.com:jacquesd/ASQ into feat-questio...
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
626dd566
|
merge
Taking from jacques also options
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
43d5166a
|
Working trigger of slide, question, answer, slide.
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
6603ff04
|
merge
Merge branch 'feat-question-pop' of github.com:jacquesd/ASQ into feat-questio...
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
bfbe79e5
|
Calculates stats
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
6711934f
|
merge
Take jacques work again
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
58556a2f
|
Added display method for question.
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
9b3b8059
|
Renamed sockets event correclty
|
Jacques DAFFLON <j****n@g****m>
|
over 13 years ago
|
|
|
a859e5d8
|
Ready to take Jacques work
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
dc08201b
|
pop question
|
margarita <m****d@u****h>
|
over 13 years ago
|
|
|
cdc32bea
|
merge
Merged with marga
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|
|
fbc527a2
|
Work on gathering stats
|
Max von Bülow <u****i@M****l>
|
over 13 years ago
|
|