scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-27 23:45:52 +08:00
Code Issues Projects Releases Packages Wiki Activity
4018 commits 90 branches 195 tags 173 MiB
Commit graph

894 commits

Author SHA1 Message Date
Matej Zrimšek
5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Luka Murn
3cdd375a2d Merge pull request #388 from biosistemika/hotfix-1.6.1 
Hotfix 1.6.1
 2017-01-06 11:23:16 +01:00
Oleksii Kriuchykhin
cba064dfcc Improve error message whan importing CSV files with incorrect character encoding [SCI-815] 2017-01-05 17:00:21 +01:00
Oleksii Kriuchykhin
4fe3030ad4 Freeze WHITELISTED_ATTRIBUTES constatnt [SCI-102] 2017-01-05 16:13:00 +01:00
Oleksii Kriuchykhin
1009347026 Add list of whitelisted attributes [SCI-102] 2017-01-05 15:33:41 +01:00
Luka Murn
ef688feb4e Hotfix 1.6.1 
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
 2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin
6487bd788a Add additional whitelisted tags [SCI-102] 2017-01-05 14:40:38 +01:00
Luka Murn
b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Oleksii Kriuchykhin
9c4191a1e0 Initial code commit [SCI-102] 2017-01-05 13:04:19 +01:00
Luka Murn
09ef3b3ad5 Merge pull request #378 from Ducz0r/lm-sci-802-fix 
Add tooltips to samples column dropdown [SCI-802]
 2017-01-04 11:30:04 +01:00
Luka Murn
2c5b27ce81 Change "Update" to "Save" 
Closes SCI-802.
 2017-01-04 11:29:34 +01:00
mlorb
59751ec41e Merge pull request #373 from mlorb/ml_sci_709 
Add Protocol Preview to Protocol repository [SCI-709]
 2017-01-04 11:28:55 +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
Luka Murn
cedc6c5074 Merge pull request #382 from Ducz0r/lm-sci-166-fix 
Re-add tags index controller action to render tags [SCI-166]
 2017-01-04 10:48:09 +01:00
Luka Murn
37cd6417c8 Merge pull request #374 from Ducz0r/lm-sci-808-814-fix 
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
 2017-01-04 09:50:26 +01:00
zmagod
a434649f42 Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-01-03 16:35:25 +01:00
Mojca Lorber
c476faca30 fix hound 2017-01-03 11:04:09 +01:00
zmagod
01c086b667 fixes routes.rb indentation 2017-01-03 09:49:18 +01:00
Luka Murn
af9e272b2a Re-add tags index controller action to render tags 
Closes SCI-166.
 2017-01-03 09:39:41 +01:00
Oleksii Kriuchykhin
d898f8993f Add description to Clone actions [SCI-766] 2016-12-29 15:33:49 +01:00
Luka Murn
2304742d87 Add tooltips to samples column dropdown 
Closes SCI-802.
 2016-12-27 08:45:23 +01:00
Luka Murn
3922be2b17 Change String in sample types & groups 
Closes SCI-808.
 2016-12-23 11:48:57 +01:00
Luka Murn
e16c826bb1 Version bump to 1.6.0 2016-12-22 11:43:52 +01:00
Mojca Lorber
40e3240a99 add content to preview modal 2016-12-22 11:43:11 +01:00
Oleksii Kriuchykhin
cbef971d85 Fix timeouts when fetching images from S3 [SCI-694] 2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin
b537feb8a0 Added large preview [SCI-694] 2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin
0541253ffa Added modal for images preview [SCI-694] 2016-12-16 15:53:16 +01:00
Zmago Devetak
90a115fff3 Merge pull request #342 from ZmagoD/zd_SCI_758 
Generate png preview images for uploaded TIFF images
 2016-12-16 15:39:07 +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
zmagod
2426539715 fixes long names in columns dropdown [fixes SCI-784] 2016-12-13 14:54:37 +01:00
Mojca Lorber
2cfcba0ceb add protocol preview modal 2016-12-13 10:39:18 +01:00
Zmago Devetak
d54007f69c Merge pull request #337 from ZmagoD/zd_SCI_740 
limits max size of all uploaded files at the one time
 2016-12-13 09:04: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
Luka Murn
d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
 2016-12-12 09:57:37 +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
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
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
zmagod
40fdfef67f setup delayed_paperclip gem 2016-12-08 15:24:14 +01:00
zmagod
ac52e643be cleanup direct upload 2016-12-08 11:26:13 +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
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
8ca7151df4 added constant to load_from_file_size_error local 2016-12-06 13:52:07 +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