|
|
2641a519a6
|
Merge pull request #38 from mattbk/fix-bad-files
Fix css change
|
2015-11-07 13:05:18 -06:00 |
|
|
|
8a17b8fb33
|
Fix css change
Somehow the changes weren’t picked up right.
|
2015-11-07 13:03:28 -06:00 |
|
|
|
2259b1b53f
|
Merge remote-tracking branch 'origin/master'
Conflicts:
index.php
|
2015-11-07 12:36:53 -06:00 |
|
|
|
f4297747ee
|
Merge pull request #37 from mattbk/click-anytime
Add a transparent div on top of the image
|
2015-11-05 15:43:16 -06:00 |
|
|
|
3e4a16ef00
|
Add a transparent div on top of the image
Capture mouse clicks even when images aren't showing.
|
2015-11-05 15:42:34 -06:00 |
|
|
|
f4220c118c
|
Merge pull request #35 from mattbk/results-order
Add sorts to the results query
|
2015-11-04 15:18:52 -06:00 |
|
|
|
c034feec97
|
Ad sorts to the results query
|
2015-11-04 15:18:02 -06:00 |
|
|
|
3c6ff4cec7
|
Merge pull request #34 from mattbk/settings-filetype
File extension for images is now defined in settings.json
|
2015-11-03 14:44:12 -06:00 |
|
|
|
88ff34bb65
|
File extension for images is now defined in settings.json
|
2015-11-03 14:43:39 -06:00 |
|
|
|
b048451f85
|
Merge pull request #33 from mattbk/timezone
Add a timezone setting in settings.php
|
2015-11-03 14:11:21 -06:00 |
|
|
|
75f143aa70
|
Add a timezone setting in settings.php
|
2015-11-03 14:10:51 -06:00 |
|
|
|
79e4dcd665
|
Add copy of Twig license
Twig's license at http://twig.sensiolabs.org/license allows for
duplication. For now, creating this file even if the plan is to ask
people to download Twig separately in the future. Closes
https://github.com/mattbk/changeblindness/issues/8.
|
2015-11-03 11:51:28 -06:00 |
|
|
|
63ecfb37a9
|
Merge pull request #32 from mattbk/fix-retry-button
Add href for retry button
|
2015-11-03 08:34:28 -06:00 |
|
|
|
59d889abcc
|
Add href for retry button
|
2015-11-03 08:33:37 -06:00 |
|
|
|
1491499d24
|
Unset $_SESSION['results'] on the start page
|
2015-11-03 08:32:15 -06:00 |
|
|
|
c9645fcaa7
|
Merge pull request #30 from mattbk/targets=-from-csv
Targets are now read from CSV file on server
|
2015-11-02 15:51:50 -06:00 |
|
|
|
69cc135fe7
|
Remove elementLocations from settings.json
Not needed, target locations are in targets.csv now.
|
2015-11-02 15:38:07 -06:00 |
|
|
|
f9f4122f99
|
Targets are now read from CSV file on server
|
2015-11-02 15:35:16 -06:00 |
|
|
|
c9530de69c
|
Merge pull request #29 from mattbk/css-fix
Add max-height to images themselves
|
2015-11-02 11:56:58 -06:00 |
|
|
|
0d853a1511
|
Add max-height to images themselves
|
2015-11-02 11:56:10 -06:00 |
|
|
|
84a22be8b9
|
Merge pull request #27 from mattbk/calculate-total-phases
Calculate total phases and display
|
2015-11-02 11:44:31 -06:00 |
|
|
|
a1245ef13a
|
Calculate total phases and display
|
2015-11-02 11:44:07 -06:00 |
|
|
|
65404e911c
|
Merge pull request #26 from mattbk/fix-image-css
Fix image css
|
2015-11-02 11:38:05 -06:00 |
|
|
|
7198608a16
|
Fix image css
Closes https://github.com/mattbk/changeblindness/issues/21.
|
2015-11-02 11:37:20 -06:00 |
|
|
|
e52291be94
|
Misc. changes
|
2015-11-01 21:03:15 -06:00 |
|
|
|
fceb1ea773
|
Merge pull request #19 from mattbk/table-in-settings
Database table name is in settings.json now.
|
2015-11-01 19:16:14 -06:00 |
|
|
|
0457924b1a
|
Database table name is in settings.json now.
Closes https://github.com/mattbk/changeblindness/issues/16.
|
2015-11-01 19:14:26 -06:00 |
|
|
|
e2d6d5e043
|
Merge pull request #15 from mattbk/add-participant-id-collection
Add participant ID
|
2015-11-01 15:11:56 -06:00 |
|
|
|
0da40716fc
|
Add participant ID
Collect participant ID at the beginning, store in database, export with
results. Closes https://github.com/mattbk/changeblindness/issues/2.
|
2015-11-01 15:11:27 -06:00 |
|
|
|
223c819138
|
Merge pull request #13 from mattbk/remove-vcd_results-table
Removed reference to vcd_results table
|
2015-11-01 14:09:14 -06:00 |
|
|
|
4f33164070
|
Removed reference to vcd_results table
|
2015-11-01 14:08:12 -06:00 |
|
|
|
0e2f1ab9fb
|
Don't need mod_rewrite anymore
|
2015-11-01 10:26:51 -06:00 |
|
|
|
84c96c0a65
|
Fixed link back to start page
|
2015-11-01 10:22:53 -06:00 |
|
|
|
c92b6aa471
|
Merge remote-tracking branch 'origin/master'
|
2015-11-01 10:10:17 -06:00 |
|
|
|
9f0b57694b
|
Merge pull request #1 from mattbk/change-results-array-structure
Change results array structure
|
2015-11-01 10:09:39 -06:00 |
|
|
|
27c9c6b658
|
Merge remote-tracking branch 'origin/master'
|
2015-11-01 10:04:19 -06:00 |
|
|
|
94ece0a3e2
|
Redo
|
2015-11-01 10:02:41 -06:00 |
|
|
|
3c0cb388e6
|
Raw results are working and downloadable
|
2015-11-01 09:34:49 -06:00 |
|
|
|
75f0e29bba
|
Score is now recorded in database
Saving this so I can move forward.
|
2015-11-01 08:52:46 -06:00 |
|
|
|
8d064d6922
|
Table structure change
Saving this while it works.
|
2015-10-30 17:02:14 -05:00 |
|
|
|
06407aa707
|
Rethinking results table structure
See comments in file.
|
2015-10-30 16:09:45 -05:00 |
|
|
|
ab3a6763c0
|
Solved timestamp issue, removed debug statements
|
2015-10-30 14:14:02 -05:00 |
|
|
|
39805f9621
|
Got most results into a new EVA table
Still need to figure out timestamps and have the user enter an
identifier at the beginning.
|
2015-10-30 13:53:39 -05:00 |
|
|
|
86c46fb736
|
Learning nested foreach loops
See comments in code.
|
2015-10-30 09:09:57 -05:00 |
|
|
|
317f4fb579
|
misc
|
2015-10-30 08:45:51 -05:00 |
|
|
|
323a7a741e
|
Remove URLs that require mod_rewrite
|
2015-10-29 19:11:33 -05:00 |
|
|
|
99c1dd6788
|
Make debugging easier
|
2015-10-29 15:24:30 -05:00 |
|
|
|
20243bcc29
|
Fix typo
|
2015-10-29 13:30:27 -05:00 |
|
|
|
839e7fe17f
|
Understanding database schema
Also halfway making sure this works with new phase names, but still need
to generalize the variable lookup so phase names don't matter in this
file.
|
2015-10-29 13:26:43 -05:00 |
|
|
|
bb5e8f73bd
|
Fixed link to mode=finish
Link was hardcoded and needed mod-rewrite. Replaced with generic
(local) path.
|
2015-10-29 08:39:39 -05:00 |
|
