scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1282 commits 70 branches 179 tags 165 MiB
Commit graph

1282 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matej Zrimšek aea679ec11 Added links for creating new sample type and group when creating new sample. [fixes SCI-701] 2016-12-09 11:39:12 +01:00
mlorb e83bce22a3 Merge pull request #339 from mlorb/improved-sample-table 
Resolving merge conflict: Reordering of Columns in samples and change from local to database storage [SCI-696]
 2016-12-08 15:54:28 +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
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
zmagod 9f1e436623 limits max size of all uploaded files at the one time [fixes SCI-740] 2016-12-07 09:02:04 +01:00
Zmago Devetak 310b61ec12 Merge pull request #335 from ZmagoD/zd_SCI_752 
fixes inport eln error message and spinner [fixes SCI-752]
 2016-12-06 15:11:34 +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
zmagod 8ca7151df4 added constant to load_from_file_size_error local 2016-12-06 13:52:07 +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
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 ef2471d3f7 fixes inport eln error message and spinner [fixes SCI-752] 2016-12-05 10:44:58 +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 7309da9d92 Version bump to 1.5.1 2016-12-01 15:54:08 +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
mz3944 1957c8a3ff Merge pull request #331 from mz3944/mz_update_scinote_net_sign_up_form_SCI_689 
Added automatic sign in with token authentication, needed when signin…
 2016-12-01 15:40:05 +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
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
Luka Murn 680f443e31 Merge pull request #323 from Ducz0r/lm-sci-733-fix 
Fix task comments not properly showing in reports
 2016-11-30 09:51:59 +01:00
Luka Murn f138a39508 Merge pull request #324 from Ducz0r/lm-sci-718-fix 
Fix intro tutorial string
 2016-11-30 09:50:40 +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