834 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alain Pitiot	b52bd9f9f9	Merge branch 'main' into 2023.2.4	2024-01-02 15:55:50 +01:00
Alain Pitiot	273cfc6cbe	Merge pull request #583 from apitiot/2023.2.3 ... _	2023-09-26 15:45:55 +02:00
Alain Pitiot	5c6408e1da	_	2023-09-26 15:43:11 +02:00
Alain Pitiot	8a6b635b8f	Merge pull request #582 from apitiot/2023.2.2 ... Merge pull request #7 from psychopy/2023.2.1	2023-09-01 15:25:22 +03:00
Nikita Agafonov	2bad0b34f1	Update main.yml	2023-08-29 15:56:08 +01:00
Nikita Agafonov	c0ae77d55c	Update main.yml	2023-08-29 15:52:32 +01:00
Nikita Agafonov	1cd6c336ff	Update main.yml	2023-08-29 15:50:02 +01:00
Nikita Agafonov	b7b7019406	Update main.yml	2023-08-29 15:46:15 +01:00
Nikita Agafonov	98da2ef3e6	Update main.yml	2023-08-29 15:40:08 +01:00
Nikita Agafonov	60452d149f	Update main.yml	2023-08-29 15:35:47 +01:00
Nikita Agafonov	3575cfd5b5	Update main.yml	2023-08-29 15:27:37 +01:00
Nikita Agafonov	fc14ca2b4d	Update main.yml	2023-08-29 14:51:27 +01:00
Nikita Agafonov	9f68f112ec	Update main.yml	2023-08-29 14:49:32 +01:00
Nikita Agafonov	30b53c5674	Merge pull request #580 from psychopy/workflow_test2 ... Create main.yml	2023-08-29 14:44:01 +01:00
Nikita Agafonov	4e848b03c9	Create main.yml	2023-08-29 14:43:18 +01:00
Nikita Agafonov	d1ccc86c1b	Merge pull request #579 from psychopy/gh_actions_experiments ... working on workflows	2023-08-29 14:20:28 +01:00
lightest	376f03537b	working on workflows	2023-08-29 14:17:05 +01:00
Nikita Agafonov	ee2a20be4b	Merge pull request #578 from psychopy/gh_actions_experiments ... Gh actions experiments	2023-08-29 14:16:01 +01:00
lightest	6c3fcfa99d	working on workflows.	2023-08-29 14:13:50 +01:00
lightest	d7abfc267d	working on gh actions.	2023-08-29 14:10:09 +01:00
Nikita Agafonov	8ffeee3c66	Merge pull request #577 from psychopy/workflow_test ... Testing workflows	2023-08-29 14:01:59 +01:00
Nikita Agafonov	4ab2af527f	Testing workflows	2023-08-29 14:01:13 +01:00
Alain Pitiot	10df4a71b3	Merge pull request #7 from psychopy/2023.2.1 ... 2023.2.1	2023-08-24 10:04:45 +02:00
Nikita Agafonov	da0077f7b2	Merge pull request #576 from psychopy/progressbar_improvements ... Progress bar bugfix.	2023-08-23 23:12:14 +01:00
lightest	2688e8e3e0	Proper rendering for progress bar.	2023-08-23 23:08:37 +01:00
Alain Pitiot	aabd9fd43d	Merge pull request #575 from apitiot/2023.2.1 ... updated package.json	2023-08-11 16:40:38 +02:00
Alain Pitiot	af6e9ab2a7	updated package.json	2023-08-11 16:39:03 +02:00
Nikita Agafonov	fc221356ff	Merge pull request #569 from lightest/2023.2.0 ... Particle Emitter Prototype and blur filter for image stim.	2023-07-21 18:42:22 +01:00
lightest	3e164977ef	names corrections.	2023-07-21 18:32:34 +01:00
lightest	71069244cb	merge with 2023.2.0	2023-07-21 18:27:24 +01:00
Nikita Agafonov	044c883739	Merge pull request #568 from lightest/2023.2.0 ... Progress prototype.	2023-07-21 18:18:01 +01:00
lightest	756c4986fa	Merge branch '2023.2.0' into progress-bar	2023-07-21 18:04:16 +01:00
Alain Pitiot	36e6f8131a	Merge pull request #567 from apitiot/2023.2.0 ... 2023.2.0	2023-07-19 16:21:51 +02:00
Alain Pitiot	2707ed0899	_	2023-07-19 16:19:01 +02:00
Alain Pitiot	7f45cf4338	Merge branch '2023.2.0' of github.com:apitiot/psychojs into 2023.2.0_cleanup	2023-07-19 16:16:23 +02:00
Alain Pitiot	ab9d030717	Merge pull request #6 from psychopy/2023.2.0 ... 2023.2.0	2023-07-19 16:11:28 +02:00
Alain Pitiot	5dba92ab37	ENH: various enhancements to the dialog box, resource manager, saving of data, capture of keys, scheduler	2023-07-19 16:07:43 +02:00
Alain Pitiot	0aa0f41067	Merge pull request #522 from TEParsons/main-shape-arrow ... NF: Add "arrow" to named shapes in ShapeStim	2023-07-19 10:58:44 +02:00
Alain Pitiot	311de2f494	Merge branch '2022.3.0' into particle_system	2023-07-19 10:50:41 +02:00
Alain Pitiot	bf2b75f0c8	Merge pull request #559 from lightest/survey_signature_pad_resize_bug ... Signature pad resize bug.	2023-07-19 10:00:33 +02:00
Alain Pitiot	e9da57194a	Merge pull request #551 from TEParsons/main-textbox-placeholder ... FF: Allow TextBox to accept "placeholder" as an input	2023-07-19 09:58:25 +02:00
Alain Pitiot	1775806a2d	Merge pull request #553 from lightest/progress-bar ... Progress bar component prototype. #gamification	2023-07-19 09:56:47 +02:00
Alain Pitiot	122250527c	log in constructor, additional comment	2023-07-19 09:55:49 +02:00
Alain Pitiot	1eb69ed6fb	Merge pull request #537 from lightest/xlsx_upgrade ... xlsx upgrade due to a string parsing bug	2023-07-19 09:52:25 +02:00
Alain Pitiot	324fa88a7a	Merge pull request #470 from RebeccaHirst/_addLinspace ... add linspace to util.js	2023-07-19 09:50:55 +02:00
Alain Pitiot	888552d24b	Merge pull request #550 from lightest/blurFilter_for_imageStim ... Blur filter for image stim.	2023-07-18 17:43:28 +02:00
lgtst	5f32881be2	removed dead code.	2023-03-24 13:23:50 +00:00
lgtst	bff887b793	src/visual	2023-03-24 13:20:34 +00:00
Alain Pitiot	e92bb527e8	Merge pull request #558 from apitiot/2023.1.1 ... ENH: improved super-flow survey; ENH: release of resources	2023-03-23 15:22:48 +01:00
Alain Pitiot	d9f5cfae63	ENH: improved super-flow survey; ENH: release of resources	2023-03-23 15:19:08 +01:00