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

2068 commits

Author SHA1 Message Date
Zanz2 f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
Zanz2 8226322e92 Fixed open html tags on truncate 2017-11-21 11:42:42 +01:00
Zanz2 529d988cc3 closing html tags 2017-11-21 11:15:09 +01:00
Zanz2 d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +01:00
Zanz2 e943df9176 fixed small rubocop error 2017-11-20 01:02:02 +01:00
Zanz2 cf66d94d45 Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields 2017-11-20 00:59:32 +01:00
Zanz2 99b16f339d New maximums, functions reworked 2017-11-17 15:16:17 +01:00
Zanz2 a6009806c4 Fixed some oversights 2017-11-17 02:56:16 +01:00
Zanz2 fa25a6785b Made the propper files and functionality for the text truncation to function 2017-11-17 02:43:32 +01:00
Zanz2 b2e1623cf1 Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784 2017-11-16 20:04:12 +01:00
Zanz2 c44465817d Added the functions and put in limitations from my validations files, changed controller name, added some locals 2017-11-16 20:03:44 +01:00
Zanz2 1b540a75a1 Fixed to use .megabytes 2017-11-16 15:17:13 +01:00
Zanz2 e782f13a7d Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810 2017-11-16 15:14:01 +01:00
okriuchykhin 42f2d7e685
Merge pull request #883 from okriuchykhin/ok_SCI_1819 
Allow import of the sample with missing non mandatory fields [SCI-1819]
 2017-11-16 11:03:08 +01:00
mlorb 6c80c338e4
Merge pull request #880 from mlorb/ml-sci-1316 
Change text for avatar size on my profile page [SCI-1316]
 2017-11-16 10:43:23 +01:00
Zanz2 41c1193a78 Fixed unit error;Now when comparing file size, both are in bytes 2017-11-16 01:34:38 +01:00
Zanz2 4d65ad59fe
Merge pull request #878 from Zanz2/protocol_description_fix 
Found a bug; i forot to include protocol description in new preview modal
 2017-11-16 01:11:52 +01:00
Oleksii Kriuchykhin f202687291 Allow import of the sample with missing non mandatory fields [SCI-1819] 2017-11-15 16:40:14 +01:00
Mojca Lorber ff998a6c98 change text for avatar size on my profile page 2017-11-15 14:21:04 +01:00
mlorb 47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434 
Add explanation when copying custom repositories [SCI-1434]
 2017-11-15 11:34:02 +01:00
mlorb 06fc0eac5e
Merge pull request #868 from mlorb/ml-sci-1215 
Fix preview for images with transparent background [SCI-1215]
 2017-11-15 11:28:57 +01:00
mlorb 288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190 
Fix bug when removing all keywords in protocol [SCI-1190]
 2017-11-15 11:22:18 +01:00
Zanz2 c3f6c2b34a Found a bug where i forot to include protocol description in preview modal and fixed it 2017-11-14 19:46:51 +01:00
Zanz2 bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794 
Made button green and added .json to supported file [SCI-1794]
 2017-11-14 19:12:45 +01:00
Mojca Lorber c2a5b52767 fix bug when removing all keywords in protocol 2017-11-14 15:04:37 +01:00
Zanz2 6b9a10ffe4 Made validations for JSON format and .txt and .json files 2017-11-14 12:02:17 +01:00
Zanz2 7ec8d7c2b2 Made button green and added .json to supported file 2017-11-14 11:46:19 +01:00
Zanz2 f35ab78849 Added some code to make the two seperate jira issues work together (protocol info and scinote tables 2017-11-14 00:56:39 +01:00
Mojca Lorber f75a2710d5 fix preview for images with transparent background 2017-11-13 18:03:14 +01:00
Mojca Lorber be74338d9f add explanation when copying custom repositories 2017-11-13 16:30:42 +01:00
mlorb cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import 
Protocols io import
 2017-11-13 11:53:28 +01:00
Zanz2 b265beb386
Merge pull request #864 from Zanz2/move_desc 
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
 2017-11-13 10:07:01 +01:00
Zanz2 23d3ffa5a4 Fixed PR 2017-11-12 15:48:45 +01:00
Zanz2 e26adc2905 Quick formatting fix 2017-11-12 15:41:50 +01:00
Zanz2 e7384ac38d Code review fixes, made seperate helper file 2017-11-12 15:31:04 +01:00
Zanz2 fa2c0fe556 merging 2017-11-09 18:55:17 +01:00
Zanz2 812fa3f1d5 Hopefully this will resolve my merge problems 2017-11-09 17:42:17 +01:00
Zanz2 a40a63ae50 Made code more aesthetic 2017-11-09 15:38:06 +01:00
Zanz2 518eb09110 Deleted un needed error flash 2017-11-09 10:49:44 +01:00
Zanz2 4b837dbe9d Forgot flash fail messagges, now added them for file too big and general error 2017-11-09 10:49:44 +01:00
Zanz2 feb686b4ac Fixed alignement 2017-11-09 10:49:44 +01:00
Zanz2 8b247770ef Added the success flash alert 2017-11-09 10:49:44 +01:00
Zanz2 9086cd8b6b Jira branch code 2017-11-09 10:49:44 +01:00
zmagod f43492adff trigger an alert to on canvas save if page reload [fixes SCI-1610] 2017-11-07 15:08:26 +01:00
mlorb 126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json 
Scinote protocols IO base branch
 2017-11-06 14:53:01 +01:00
Zanz2 4354363215 rubocop refactor css 2017-11-03 16:46:03 +01:00
Zanz2 ac26b17ddf Rubocop refactor 2017-11-03 16:45:15 +01:00
Zanz2 aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +01:00
Zanz2 096ee00e07 removed unnecessary html 2017-11-03 01:28:20 +01:00
Zanz2 6a4c38bbee Fixed table elements render bugs, now renders after shown event 2017-11-03 01:04:50 +01:00