278 commits

Author	SHA1	Message	Date
zmagod	6efcf49927	working version of dropdown filter	2017-01-10 14:14:21 +01:00
zmagod	53d20df449	added xregexp	2017-01-10 14:14:21 +01:00
zmagod	94262b56ef	prepare data for atwho	2017-01-10 14:14:21 +01:00
Luka Murn	3bee9d2e12	Save an (yet unworking) version of user smart annotations ... Used so other devs can start working on smart annotations.	2017-01-04 10:54:02 +01:00
Zmago Devetak	5d0e80a5e1	Merge pull request #369 from ZmagoD/zd_SCI_812 ... fixes bug with samples sorting [fixes SCI-812]	2017-01-03 08:56:59 +01:00
okriuchykhin	cce57d066c	Merge pull request #370 from okriuchykhin/ok_SCI_817 ... Fix issue with long samples column names in import modal [SCI-817]	2016-12-30 15:29:32 +01:00
okriuchykhin	e8955b0304	Merge pull request #375 from okriuchykhin/ok_SCI_361 ... Add sorting to Project's experiments overview [SCI-361]	2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin	d798f1b120	Fix XSS vulnerability in protocol keywords [SCI-632]	2016-12-29 15:15:29 +01:00
Oleksii Kriuchykhin	4d3e002c81	Add sorting to Project's experiments overview [SCI-361]	2016-12-23 15:40:01 +01:00
Oleksii Kriuchykhin	53ea09c3de	Fix issue with long samples column names in import modal [SCI-817]	2016-12-21 14:34:53 +01:00
zmagod	e2723a288c	fixes bug with samples sorting [fixes SCI-812]	2016-12-21 14:32:28 +01:00
Zmago Devetak	c8631077df	Merge pull request #361 from biosistemika/improved-sample-table ... Improved sample table	2016-12-16 15:37:54 +01:00
zmagod	6d2fb3b02c	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790	2016-12-14 17:05:00 +01:00
okriuchykhin	c4ff12be51	Merge pull request #349 from okriuchykhin/ok_SCI_783 ... Fix columns ordering when deleting custom fields [SCI-783]	2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin	de8eed0a19	Fix hound warning [SCI-783]	2016-12-14 15:27:24 +01:00
Oleksii Kriuchykhin	fa1cf1f04d	Better handling of columns deleting with fixing columns ordering [SCI-783]	2016-12-14 15:23:00 +01:00
zmagod	3c1a275510	fixes invited user samples table [fixes SCI-790]	2016-12-13 10:56:13 +01:00
zmagod	4b0e2baa3f	fixes breadcrumbs in secondary nav	2016-12-12 16:03:14 +01:00
zmagod	8dd8a7e7cd	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777	2016-12-12 15:52:25 +01:00
zmagod	8bb452e4f7	trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]	2016-12-12 10:30:03 +01:00
Luka Murn	1a8b141b95	Add delete custom field functionality	2016-12-09 13:49:19 +01:00
Luka Murn	754c90b612	Edit functionality now works	2016-12-09 13:18:59 +01:00
Mojca Lorber	0e3526c9ad	Merge branch 'mlorb-ml-sci-696' into improved-sample-table ... Conflicts: app/assets/javascripts/samples/sample_datatable.js	2016-12-08 15:44:50 +01:00
okriuchykhin	cb2abfa7a9	Merge pull request #325 from okriuchykhin/ok_SCI_712 ... Added form for adding new columns to samples table into dropdown [SCI-712]	2016-12-06 15:00:01 +01:00
Oleksii Kriuchykhin	f6dd64772a	Add columns to samples table without page reload [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	22dabd2177	Added form for adding new columns to samples table into dropdown [SCI-712]	2016-12-06 13:17:05 +01:00
Mojca Lorber	849f78b4df	implement reordering of columns in the samples table and change from local to database storage	2016-12-05 11:34:36 +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
Luka Murn	372b455d7d	Merge pull request #332 from Ducz0r/lm-sci-750-751 ... Fix inviting users not working	2016-12-01 15:52:40 +01:00
Luka Murn	6a770f6a7e	Fix inviting users not working ... Closes SCI-750, SCI-751. Probably reopens parts of SCI-746.	2016-12-01 15:46:37 +01:00
Matej Zrimšek	3bdaa4bcef	Some token authentication refactoring and error handilng fixes. [closes SCI-689]	2016-12-01 15:38:56 +01:00
Matej Zrimšek	46465060d0	Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]	2016-11-30 16:56:56 +01:00
Luka Murn	76ec77fce4	Merge pull request #329 from biosistemika/simplify-signup ... Merge simplify-signup into master	2016-11-30 09:41:20 +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
Luka Murn	b5d0a39827	Fix some recaptcha form submit errors for signup pages ... Closes SCI-746.	2016-11-29 15:53:58 +01:00
zmagod	5c0b2d7b24	init sample_types page	2016-11-29 08:57:12 +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	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
okriuchykhin	5981d1a48e	Merge pull request #316 from okriuchykhin/ok_SCI_738 ... Add full name field to accept invitation form [SCI-738]	2016-11-25 16:15:23 +01:00
Oleksii Kriuchykhin	74f6455a8f	Add whitelisting of supported image types [SCI-736]	2016-11-25 16:12:43 +01:00
Oleksii Kriuchykhin	3fdb20b92c	Add full name field to accept invitation form [SCI-738]	2016-11-25 11:15:10 +01:00
Luka Murn	87d3280847	Refactor registrations_controller code slightly	2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin	698e07a3b5	Enable reCaptcha and auto log in on confirm invitation form [SCI-706]	2016-11-24 14:11:02 +01:00
Luka Murn	198febfd94	Fix user projects not working	2016-11-23 13:19:10 +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