844 commits

Author	SHA1	Message	Date
Zmago Devetak	49f9e64171	Merge pull request #333 from ZmagoD/zd_SCI_700 ... Managing sample groups tab	2016-12-06 14:51:09 +01:00
zmagod	dd85b128d2	fixed glyphicon-ok position	2016-12-06 14:47:16 +01:00
zmagod	787b8b1600	fixed new sample type/group form	2016-12-06 12:01:02 +01:00
zmagod	7725374c42	refactor sample types/groups [fixes SCI-700]	2016-12-02 09:58:35 +01:00
zmagod	83aae59eed	adds sample groups index page	2016-12-02 09:33:09 +01:00
Zmago Devetak	33adb58950	Merge pull request #328 from ZmagoD/zd_SCI_699 ... Managing sample types tab	2016-11-30 16:14:13 +01:00
Oleksii Kriuchykhin	2a27c8e6b3	Fix hound warning [SCI-695]	2016-11-30 11:52:07 +01:00
Oleksii Kriuchykhin	f51f33ec25	Added sorting functionality to samples colunmns dropdown [SCI-695]	2016-11-30 11:42:05 +01:00
zmagod	a2e13441e5	removes create_sample_type modal and related js actions	2016-11-30 09:02:34 +01:00
zmagod	4e4a48620c	adds validation to input fields	2016-11-29 18:08:29 +01:00
zmagod	12848f15fa	adds sample_type index view with all crud actions	2016-11-29 17:15:54 +01:00
zmagod	5c0b2d7b24	init sample_types page	2016-11-29 08:57:12 +01:00
Zmago Devetak	1e870a6e7c	Merge pull request #320 from ZmagoD/zd_SCI_698 ... adds new samples columns dropdown [fixes SCI-698]	2016-11-28 16:30:16 +01:00
zmagod	72d1dfb15e	cleanup sample_datatable.js	2016-11-28 16:28:22 +01:00
zmagod	9d91d2ce28	adds new samples columns dropdown [fixes SCI-698]	2016-11-25 17:29:30 +01:00
Luka Murn	7658ae264a	Add uniqueness to sample_type & sample_group name ... Closes SCI-720.	2016-11-25 16:15:05 +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	198febfd94	Fix user projects not working	2016-11-23 13:19:10 +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
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
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
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
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
Luka Murn	3be30c0e7a	Re-introduce fix for SCI-650 that was lost during merge ... Closes SCI-650.	2016-11-18 10:57:03 +01:00
Matej Zrimšek	f13cc5be0e	Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).	2016-11-17 18:03:49 +01:00
Luka Murn	08c6210f7c	Also employ "no format" Nokogiri strategy when sanitizing ... Closes SCI-691.	2016-11-17 16:43:14 +01:00