Luka Murn
b931b20f02
Fix 2 bugs with comments editing
...
Closes SCI-820.
2016-12-23 20:41:23 +01:00
Luka Murn
4b50c73474
Merge pull request #363 from Ducz0r/lm-sci-546-fix
...
Restyle step table display in reports [SCI-546]
2016-12-23 12:57:54 +01:00
Luka Murn
a48eaf662e
Restyle step table display in reports so
...
Closes SCI-546.
2016-12-19 15:09:49 +01:00
zmagod
efe41817f2
removes sample group/type link in new sample form [fixes SCI-809]
2016-12-19 10:49:21 +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
ba58ac2a77
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796
2016-12-15 09:26:12 +01:00
zmagod
4d6a85ed7c
fixed sample groups colorpicker [fixes SCI-781]
2016-12-15 09:23:38 +01:00
zmagod
b07f9fae59
fixes new sample group/type link in sample row [fixes SCI-796]
2016-12-15 09:23:38 +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
fa1cf1f04d
Better handling of columns deleting with fixing columns ordering [SCI-783]
2016-12-14 15:23:00 +01:00
zmagod
1ff98bb6df
adds tooltip to samples dropdown and column names
2016-12-14 13:36:10 +01:00
zmagod
9037ab3f48
fixed navigation link
2016-12-14 10:35:48 +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
5176f8b459
clean unneeded code [fixes SCI-778] refactor js
2016-12-12 15:40:13 +01:00
zmagod
d9025a9601
changes create/edit mode buttons [fixes SCI-777]
2016-12-12 14:42:06 +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
da630ac2cb
Make edit, delete buttons clickable & hide them if neccesary
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
zmagod
dd85b128d2
fixed glyphicon-ok position
2016-12-06 14:47:16 +01:00
Oleksii Kriuchykhin
da7e86c7c2
Fix save/delete buttons after updating datatable and added permissions check [SCI-712]
2016-12-06 13:22:26 +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
40db8310fd
Move code to sample_datatable.js and removed unused modal [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
Oleksii Kriuchykhin
94866e8994
Initial code commit for samples columns dropdown [SCI-712]
2016-12-06 13:16:05 +01:00
zmagod
787b8b1600
fixed new sample type/group form
2016-12-06 12:01:02 +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
Zmago Devetak
a376118cd8
Merge pull request #334 from ZmagoD/zd_SCI_746
...
fixes bug with deleted team name
2016-12-05 10:47:39 +01:00
Zmago Devetak
91f29745c4
Merge pull request #314 from ZmagoD/zd_SCI_643
...
adds autolink
2016-12-05 10:47:23 +01:00
zmagod
6274cd413e
fixes bug with deleted team name [fixes SCI-746]
2016-12-02 16:07:00 +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
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
Luka Murn
c0a03d9f2d
Merge pull request #322 from Ducz0r/lm-add-show-version-var
...
Add an environmental variable to toggle version display in navbar
2016-11-30 09:49:40 +01:00
Luka Murn
84d0cf4620
Use rails helpers as per @ZmagoD's request
2016-11-30 09:48:57 +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
Luka Murn
d685ac939b
Merge pull request #326 from Ducz0r/lm-sci-746-fix
...
Fix some recaptcha form submit errors for signup pages
2016-11-30 09:35:16 +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
Luka Murn
e099a279b1
Remove link to "Resend confirmation instructions" if not neccesary
...
Closes SCI-747.
2016-11-29 16:12:35 +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
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
Luka Murn
9f998d6fed
Add an environmental variable to toggle version display in navbar
...
The variable is called NAVBAR_SHOW_VERSION. If not specified,
it defaults to the current behavior (version is hidden on
production, but visible on development & test environments).
2016-11-28 10:52:17 +01:00
Luka Murn
d142fa96d9
Merge pull request #317 from Ducz0r/lm-sci-735-fix
...
Add Deface hooks to sign up & confirm invitation forms
2016-11-28 10:22:46 +01:00
zmagod
9d91d2ce28
adds new samples columns dropdown [fixes SCI-698]
2016-11-25 17:29:30 +01:00