1040 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luka Murn	073f30dcc5	Fix task comments not properly showing in reports ... Closes SCI-733.	2016-11-28 17:14:27 +01:00
okriuchykhin	f9c8223fe5	Merge pull request #321 from okriuchykhin/ok_SCI_736 ... Improve regexp for image whitelisting [SCI-736]	2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin	d8f8e01a46	Code cleanup, added new image types to whitelist [SCI-736]	2016-11-28 11:13:20 +01:00
Oleksii Kriuchykhin	cc0aab2e59	Improve regexp for image whitelisting [SCI-736]	2016-11-28 10:08:54 +01:00
okriuchykhin	31f6379866	Merge pull request #318 from okriuchykhin/ok_SCI_736 ... Add whitelisting of supported image types [SCI-736]	2016-11-28 09:32:49 +01:00
Luka Murn	d0b86de3a4	Use Rails's email regex	2016-11-25 17:37:27 +01:00
Oleksii Kriuchykhin	74f6455a8f	Add whitelisting of supported image types [SCI-736]	2016-11-25 16:12:43 +01:00
Luka Murn	5b917768a7	Update README.md	2016-11-25 11:27:43 +01:00
Luka Murn	b1b095910c	Merge pull request #309 from Ducz0r/lm-remove-unused-files ... Brace for impact...	2016-11-25 10:00:29 +01:00
Luka Murn	91ffb232e2	Version bump to 1.5.0	2016-11-24 11:37:45 +01:00
Luka Murn	de7c0ad641	Remove commit reference to quill-rails in Gemfile	2016-11-24 09:19:43 +01:00
Luka Murn	198febfd94	Fix user projects not working	2016-11-23 13:19:10 +01:00
mz3944	d749b6705f	Merge pull request #307 from mz3944/mz_remove_tutorial_overlay_fix_SCI_707 ... Fixed tutorial overlay unexpectedly blurring the screen when not runn…	2016-11-23 11:23:43 +01:00
Matej Zrimšek	1db926101d	Minor refactoring.	2016-11-23 10:48:43 +01:00
Matej Zrimšek	6bc2603157	Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]	2016-11-23 10:36:09 +01:00
Zmago Devetak	341fb13a26	Merge pull request #310 from ZmagoD/zd_add_email_login_constraints ... adds rake task that creates a sign up email domain constraint	2016-11-23 09:16:24 +01:00
Zmago Devetak	0f3db56a74	Merge pull request #311 from ZmagoD/zd_SCI_716 ... load comments after edit step [fixes SCI-716]	2016-11-23 09:14:57 +01:00
zmagod	d75d58b159	moved email constraint to database_helper	2016-11-23 09:13:09 +01:00
okriuchykhin	afb435e91d	Merge pull request #306 from okriuchykhin/ok_SCI_703_v1 ... Reload page after exit from tutorial [SCI-703]	2016-11-22 17:20:58 +01:00
Luka Murn	fba646bfba	Fix Hound errors	2016-11-22 15:19:12 +01:00
Luka Murn	7cbe44d1f2	Refactor user projects & user my modules code	2016-11-22 15:16:26 +01:00
Luka Murn	201b1a48d5	Refactor user my modules code	2016-11-22 15:07:18 +01:00
Luka Murn	e0607f7891	Refactor step comments code	2016-11-22 15:01:48 +01:00
Luka Murn	0c96036de8	Refactor some sample types code	2016-11-22 14:59:57 +01:00
Luka Murn	8ff5285179	Refactor some sample groups code	2016-11-22 14:57:01 +01:00
Luka Murn	f5e286b1f6	Remove unused code for some more comments	2016-11-22 14:52:43 +01:00
zmagod	8d7285ce7c	load comments after edit step [fixes SCI-716]	2016-11-22 14:39:08 +01:00
Luka Murn	1f7a8712fb	Update task comments & task tags controllers & localized Strings ... (Remove a lot of unused code)	2016-11-22 14:26:35 +01:00
Oleksii Kriuchykhin	d7aa155860	Disable keyboard navigation in tutorial [SCI-703]	2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin	be59b85d3b	Added additional checks for tutorial steps [SCI-703]	2016-11-22 13:55:23 +01:00
Oleksii Kriuchykhin	cc86ff268f	Reload page after exit from tutorial [SCI-703]	2016-11-22 13:49:57 +01:00
zmagod	10d40a391a	adds rake task that creates a sign up email domain constraint	2016-11-22 10:10:12 +01:00
Luka Murn	8505d75bca	Fix Hound errors	2016-11-21 17:33:08 +01:00
mz3944	c5bc3a4dc6	Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2 ... Added additional tutorial step for showing protocol link. Tutorial st…	2016-11-21 16:06:45 +01:00
mlorb	f4aa75b4d2	Merge pull request #305 from mlorb/ml_sci_692 ... Fix empty space and blockquote padding - rich text editing [SCI-692]	2016-11-21 14:38:33 +01:00
okriuchykhin	c13a1cdd5c	Merge pull request #308 from okriuchykhin/ok_SCI_684 ... Changes default behaviour for absolute urls in Quill [SCI-684]	2016-11-21 14:34:38 +01:00
Oleksii Kriuchykhin	d6f5f6b9bf	Changes default behaviour for absolute urls in Quill [SCI-684]	2016-11-21 14:18:08 +01:00
Luka Murn	1dff6c527e	Merge pull request #302 from Ducz0r/lm-sci-691-fix ... Correctly import protocols with rich text [SCI-691]	2016-11-21 14:04:22 +01:00
Luka Murn	59eb1c1d18	Remove unused new, edit user_projects views	2016-11-19 17:01:10 +01:00
Luka Murn	911b7ba72f	Remove unused new user_my_module view	2016-11-19 16:59:24 +01:00
Luka Murn	6999105e51	Remove tags	2016-11-19 16:57:08 +01:00
Luka Murn	008b31df0c	Finish removing new comment forms	2016-11-19 16:54:55 +01:00
Luka Murn	595b213b1a	Changes up to samples in views folder	2016-11-19 16:51:40 +01:00
Luka Murn	7deb80bb06	Add make worker command	2016-11-19 15:26:16 +01:00
Luka Murn	5864640df2	Update README.md	2016-11-19 14:14:43 +01:00
Luka Murn	b12753e055	Delete CONTRIBUTING.md	2016-11-19 14:13:41 +01:00
Luka Murn	523f456e45	Remove a lot of stuff from README.md ... It is now in Wiki.	2016-11-19 14:13:06 +01:00
Mojca Lorber	91b0f4907c	fix hound	2016-11-18 12:54:32 +01:00
Mojca Lorber	086f937fbb	fix empty space and blockquote padding - rich text editing	2016-11-18 12:43:57 +01:00
Luka Murn	f5795f5516	Remove unused assets & helpers	2016-11-18 11:30:03 +01:00