376 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alain Pitiot	ef08c44c02	added missing docs	2021-05-31 13:49:13 +02:00
Alain Pitiot	8badaf7ade	_	2021-05-31 09:29:15 +02:00
Alain Pitiot	721b88631a	_	2021-05-31 09:25:09 +02:00
Alain Pitiot	311ffa5a10	Merge pull request #1 from psychopy/main ... fetch from upstream, incorporate recent Sotiri changes	2021-05-31 08:48:29 +02:00
Alain Pitiot	3130773b94	Merge pull request #1 from psychopy/main ... fetch from upstream, incorporate recent Sotiri changes	2021-05-31 08:48:29 +02:00
Alain Pitiot	54e57c46c1	Merge branch 'master' into main	2021-05-31 08:47:47 +02:00
Alain Pitiot	0873570bae	Merge branch 'master' into main	2021-05-31 08:47:47 +02:00
Alain Pitiot	f155192fd5	_	2021-05-31 08:32:35 +02:00
Alain Pitiot	60cfc55627	_	2021-05-31 08:32:35 +02:00
Alain Pitiot	020978f4f0	Update README.md	2021-05-25 14:33:37 +02:00
Alain Pitiot	21d39e8d46	Update README.md	2021-05-25 14:32:38 +02:00
Alain Pitiot	fbd30ab2db	Merge pull request #345 from thewhodidthis/bf#339--trial-handler ... data/TrialHandler: allow for calling next() like PsychoPy	2021-05-25 11:04:17 +02:00
Alain Pitiot	f23b696814	Merge pull request #349 from thewhodidthis/bf#346--sound ... sound/TrackPlayer: drop extra play / seek calls	2021-05-25 10:39:16 +02:00
Sotiri Bakagiannis	ee1edfa99c	data/TrialHandler: drop the getter on trialIterator	2021-05-25 09:35:55 +01:00
Alain Pitiot	37c4e2d9de	Merge pull request #333 from thewhodidthis/nf#315--form ... visual/Slider/Form/TextBox: towards implementing five color model	2021-05-25 10:27:22 +02:00
tpronk	2303fffa3f	BF: Trivial change to trigger GitHub to rebuild the pages	2021-05-24 13:03:26 +01:00
Jon Peirce	f44ba55291	Merge pull request #351 from thewhodidthis/bf#347--no-master ... DOCS: update contributing guide to reflect default branch is now main	2021-05-24 13:01:40 +01:00
Sotiri Bakagiannis	ba8a974fd4	DOCS: update contributing guide to reflect default branch is now main	2021-05-24 10:12:47 +01:00
Sotiri Bakagiannis	1987c26b93	Merge pull request #350 from tpronk/add_CONTIBUTING ... DOCS: Add contributing guide	2021-05-21 11:48:14 +01:00
Thomas Pronk	e44e3ea569	DOCS: Contribution guide	2021-05-21 11:30:25 +01:00
Sotiri Bakagiannis	61ea059cd5	sound/TrackPlayer: drop extra play / seek calls	2021-05-21 07:44:53 +01:00
Sotiri Bakagiannis	91f5c86adc	data/TrialHandler: add next method, trialIterator getter	2021-05-19 17:18:47 +01:00
tpronk	9b5adc8522	Update package.json	2021-05-19 15:39:52 +01:00
tpronk	843e8eec79	Update package.json	2021-05-19 15:29:36 +01:00
Sotiri Bakagiannis	284542c114	Merge pull request #344 from tpronk/testrun_badges ... DOCS: Add testrun badges to README	2021-05-18 13:52:38 +01:00
tpronk	3efb310faf	Update node to v14	2021-05-18 13:08:48 +01:00
tpronk	5ce13c95d2	Add testrun badges to README	2021-05-18 00:17:53 +01:00
tpronk	733526ae63	Update Automated Test (short).yml	2021-05-17 20:36:44 +01:00
tpronk	d1ce5a17fc	Update and rename test_thorough.yml to Automated Test (full).yml	2021-05-17 20:36:25 +01:00
tpronk	32869b9924	Rename to "fast" to "short"	2021-05-17 20:34:46 +01:00
tpronk	cb64593af0	Update test_thorough.yml	2021-05-17 18:33:23 +01:00
tpronk	e5539399f2	Update default label to "fast"	2021-05-17 17:55:24 +01:00
Sotiri Bakagiannis	26e44b147f	Merge pull request #337 from peircej/master ... DOCS: Add Code Covenant and update the readme	2021-05-17 15:16:31 +01:00
Jon Peirce	7f4899ed5e	DOCS: better wording regarding generating PsychoJS from Builder	2021-05-17 14:25:19 +01:00
Jon Peirce	b8fd62f68d	DOCS: move the Code Covenant badge to the top of page	2021-05-17 14:20:07 +01:00
Jon Peirce	22c082cca7	DOCS: readme updated and code of conduct added	2021-05-17 14:18:24 +01:00
Alain Pitiot	0121eeab1d	Merge pull request #320 from thewhodidthis/bf#290--bom ... data/ExperimentHandler: prepend BOM when exporting CSV	2021-05-16 16:51:17 +02:00
Alain Pitiot	1ee86be4f8	Merge pull request #327 from thewhodidthis/nf#316--button ... Implement ButtonStim class	2021-05-16 16:48:12 +02:00
Sotiri Bakagiannis	0cafac1689	visual/Slider/Form/TextBox: towards implementing five color model	2021-05-14 20:59:30 +01:00
Sotiri Bakagiannis	52b53376d8	visual/ButtonStim: make sure isClicked tracks left mouse button presses only	2021-05-10 16:14:09 +01:00
tpronk	2dd1d599e2	Let's see if it runs this evening	2021-05-10 15:39:41 +01:00
tpronk	b0d7701878	ENH: Changed CRON time for a test	2021-05-10 15:24:38 +01:00
Sotiri Bakagiannis	335f7dfece	visual/TextBox: import ButtonStim class	2021-05-10 14:33:37 +01:00
Sotiri Bakagiannis	6e5f63baff	visual/ButtonStim: fix class name	2021-05-10 14:33:08 +01:00
tpronk	d475a02479	Create test_thorough.yml	2021-05-10 14:31:12 +01:00
tpronk	0701354f15	BF: path issues	2021-05-10 14:27:12 +01:00
tpronk	43b36a95d1	BF: Fix typo	2021-05-10 14:24:05 +01:00
tpronk	45a2bb1938	Create test_fast.yml	2021-05-10 14:22:38 +01:00
Sotiri Bakagiannis	6e1befa8c6	visual: export ButtonStim	2021-05-10 14:04:46 +01:00
Sotiri Bakagiannis	61e41553d3	visual/TextBox+TextInput: skip event listeners for ButtonStim	2021-05-10 14:04:32 +01:00