scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-09 17:09:45 +08:00
Code Issues Projects Releases Packages Wiki Activity
1077 commits 40 branches 184 tags 168 MiB
Commit graph

1077 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mojca Lorber
1b2a438ed4 remove fixed columns 2016-12-08 15:24:54 +01:00
Mojca Lorber
7d88e247fc refactoring 2016-12-08 14:41:35 +01:00
Mojca Lorber
227fe9c284 change to after_create 2016-12-07 17:43:00 +01:00
Mojca Lorber
87dc76f4e3 change to update samples table state after initialize 2016-12-07 17:25:42 +01:00
Mojca Lorber
114a17ff0f change to create 2016-12-07 16:57:17 +01:00
Mojca Lorber
228990f9da fix samples table state, when adding new custom column 2016-12-07 16:37:16 +01:00
Mojca Lorber
5b5342de6f make first column fixed 2016-12-07 15:02:18 +01:00
Mojca Lorber
195055f9cf change SAMPLES_TABLE_DEFAULT_STATE 2016-12-07 14:51:34 +01:00
Mojca Lorber
39b6fa66fe add SamplesTable for new users 2016-12-07 14:14:32 +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
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
Oleksii Kriuchykhin
e02d780e44 Added Enter key handling and fixed error reporting [SCI-712] 2016-12-06 13:22:26 +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
Mojca Lorber
1bc0ca9e75 fix bug with first time load 2016-12-06 13:14:29 +01:00
zmagod
787b8b1600 fixed new sample type/group form 2016-12-06 12:01:02 +01:00
Mojca Lorber
12088ebfd3 add visibility functionality after refresh 2016-12-06 09:40:28 +01:00
Mojca Lorber
332b6c58da fix hound 2016-12-05 11:44:47 +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
Mojca Lorber
01e75fbbcc create samples table model and migration 2016-12-05 11:08:33 +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
okriuchykhin
a1be687e45 Merge pull request #330 from okriuchykhin/ok_SCI_695 
Added sorting functionality to samples columns dropdown [SCI-695]
 2016-11-30 13:48:31 +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
1859df0319 fix hound 2016-11-30 09:44:49 +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
Luka Murn
a41278f03c Merge pull request #319 from Ducz0r/lm-sci-720-fix 
Add uniqueness to sample_type & sample_group name
 2016-11-28 13:53:02 +01:00
Luka Murn
5035ec338b Code style fix 2016-11-28 13:51:28 +01:00
zmagod
9d91d2ce28 adds new samples columns dropdown [fixes SCI-698] 2016-11-25 17:29:30 +01:00
Luka Murn
a7f8aad62c Fix Hound errors 2016-11-25 16:53:38 +01:00
Luka Murn
c1c73ad804 Update schema.rb 2016-11-25 16:51:39 +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
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