Commit graph

471 commits

Author SHA1 Message Date
Jonathan Kingston
30c55e093c Add a code of conduct and contributing file. 2017-06-23 14:22:26 +01:00
luke crouch
2a3aa296c0 Merge pull request #633 from jonathanKingston/different-display-of-notice-b
Aligning items to center for container notification.
2017-06-22 16:28:27 -05:00
Jonathan Kingston
10e83d3795 Aligning items to center for container notification. 2017-06-22 22:22:45 +01:00
luke crouch
29b9590878 Merge pull request #631 from jonathanKingston/different-display-of-notice
Fix different display in content warning notice. Fixes #630
2017-06-22 16:09:13 -05:00
Jonathan Kingston
a86bcf7983 Fix different display in content warning notice. Fixes #630 2017-06-22 22:05:05 +01:00
groovecoder
e28b25e04c fix #626: cast message userContextId to string 2017-06-22 22:04:00 +01:00
luke crouch
1cc3ab83b9 Merge pull request #627 from jonathanKingston/correct-assignment-toggle
Fixing the assignment toggle for when a different container is open. …
2017-06-22 10:11:44 -05:00
Jonathan Kingston
0566c9f962 Fixing the assignment toggle for when a different container is open. Fixes #611 2017-06-22 16:09:10 +01:00
luke crouch
8c92d8ef5d Merge pull request #629 from jonathanKingston/assignment-confirm-alignment
Fixing alignment of checkbox on confirm screen. Fixes #607
2017-06-22 09:49:49 -05:00
Jonathan Kingston
a8cac47125 Fixing alignment of checkbox on confirm screen. Fixes #607 2017-06-22 15:43:56 +01:00
groovecoder
e191255c47 fix #608: re-"render" badge on window focus change 2017-06-22 15:35:55 +01:00
groovecoder
7eb752c2f7 fix #614: only call thisStudy.shutdown in shield 2017-06-22 14:50:31 +01:00
luke crouch
40f2f1af5e Merge pull request #620 from jonathanKingston/tooltips
Adding tooltips. Fixes #615. Fixes #609.  Fixes #112
2017-06-22 08:43:16 -05:00
Jonathan Kingston
214a83deda Adding tooltips. Fixes #615. Fixes #609. Fixes #112 2017-06-22 14:40:01 +01:00
luke crouch
51b804f96d Merge pull request #621 from jonathanKingston/close-correct-assignment
Close correct assignment window on confirmation page. Fixes #606
2017-06-22 08:16:03 -05:00
Jonathan Kingston
83e8340a70 Close correct assignment window on confirmation page. Fixes #606 2017-06-22 13:45:31 +01:00
groovecoder
6292d9b25d fix #498: final copy for security onboarding panels 2017-06-22 11:38:23 +01:00
groovecoder
2f5e195c91 for #498: use local node_modules/.bin/json 2017-06-22 11:38:23 +01:00
groovecoder
af966d6d29 for #498 add onboarding-3-security.png asset
remove tab.create orientation
2017-06-22 11:38:23 +01:00
groovecoder
4ed136299b replace a .then() with await Promise.all() 2017-06-22 11:38:23 +01:00
groovecoder
5237e67fa6 for #498: security onboarding panels and logic 2017-06-22 11:38:23 +01:00
luke crouch
13cd601212 Merge pull request #602 from jonathanKingston/edit-restyle
Edit restyle
2017-06-20 10:18:46 -05:00
Jonathan Kingston
bc847b53f5 Making create screen have buttons again 2017-06-19 15:51:29 +01:00
Jonathan Kingston
4e0180d521 Improve assignment styles part of #561 2017-06-19 14:33:57 +01:00
Jonathan Kingston
13e4b4e7f7 WIP styles improving radio styles 2017-06-19 14:33:57 +01:00
Jonathan Kingston
2278498b06 WIP edit-containers restyle 2017-06-19 14:33:57 +01:00
luke crouch
6533c74d0a Merge pull request #597 from jonathanKingston/sheild-study-fixes
Fix icons in shield study. Fixes #586
2017-06-16 10:30:17 -05:00
Jonathan Kingston
9b0fe826de Fix icons in shield study. Fixes #586 2017-06-16 15:14:21 +01:00
groovecoder
5d75d4525d document "alltabs-menu" as an open tab source 2017-06-15 20:35:55 +01:00
luke crouch
59f2b8a764 Merge pull request #593 from jonathanKingston/current-tab-window
Fix for current tab showing the wrong window. Fixes #592
2017-06-15 10:30:06 -05:00
Jonathan Kingston
68c21624e2 Reset context menu when assignment changes. Fixes #589 2017-06-15 13:39:22 +01:00
Jonathan Kingston
bfc6f68978 Fix for current tab showing the wrong window. Fixes #592 2017-06-14 23:59:54 +01:00
groovecoder
78ef2e8304 update README for shield per @kjozwiak 2017-06-14 23:10:50 +01:00
luke crouch
5b85fc1690 Merge pull request #584 from jonathanKingston/assignment-context-issues
Fixing showing of assignment menu. Fixes #579
2017-06-14 11:39:13 -05:00
luke crouch
be8f6bbe7c Merge pull request #581 from jonathanKingston/keyboard-focus
Fixing keyboard focus issues to new layout
2017-06-14 11:27:37 -05:00
Jonathan Kingston
dfd420d1a5 Fix which assignment is being changed. Fixes #580 2017-06-14 17:01:14 +01:00
luke crouch
4030b6eeec Merge pull request #582 from jonathanKingston/fix-reload-telemetry
Fix reload telemetry payload.
2017-06-14 10:38:55 -05:00
Jonathan Kingston
d2b4d972e1 Fixing showing of assignment menu. Fixes #579 2017-06-14 13:49:13 +01:00
Jonathan Kingston
06d381b931 Fix reload telemetry payload. 2017-06-14 12:09:18 +01:00
Jonathan Kingston
c2ed5420a4 Fixing keyboard focus issues to new layout 2017-06-14 11:41:28 +01:00
luke crouch
fc789a49ac Merge pull request #576 from jonathanKingston/shield-study
Shield study work
2017-06-13 11:41:28 -05:00
Jonathan Kingston
bf75f52a52 Fix linting 2017-06-13 16:36:00 +01:00
Jonathan Kingston
090ae1f139 Fixing popup to use tabId for messaging assignment change 2017-06-13 15:02:47 +01:00
Jonathan Kingston
cd2e110c17 Merge branch 'ux-fiddles' into shield-study 2017-06-13 14:09:27 +01:00
Jonathan Kingston
d63e887ef7 Merge branch 'assignment-manage' into shield-study 2017-06-13 14:07:21 +01:00
Jonathan Kingston
ea0c9d4306 Merge branch 'comma-shortcut' into shield-study 2017-06-13 14:05:29 +01:00
Jonathan Kingston
e5a87ab535 Merge branch 'assign-menu-for-wrong-tab' into shield-study 2017-06-13 14:05:10 +01:00
Jonathan Kingston
3b9da05e67 Merge branch 'bakulf-colors' 2017-06-12 15:04:13 +01:00
baku
5c5cf02249 Reset color and icon when disabled - issue #398 2017-06-12 15:03:49 +01:00
Jonathan Kingston
8503e9c9c5 Adding manage assignment from edit container panel. Fixes #501 2017-06-06 16:48:01 +01:00