scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-10-02 04:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
2546 commits 69 branches 179 tags 166 MiB
Commit graph

2546 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zmago Devetak 58c850cfad Merge pull request #849 from ZmagoD/zd_SCI_1724 
adds environment variable that disables/enables the creation of new t…
 2017-10-26 12:37:55 +02:00
zmagod d2ed415a25 Fixes per @okriuchykhin 's request 2017-10-26 10:42:18 +02:00
Zanz2 79e0a11054 Fixed before start and link not displaying in protocol description 2017-10-25 17:39:01 +02:00
Zanz2 a645bcb32d fixed oversight;Changed double quote to single 2017-10-25 17:21:05 +02:00
zmagod 5e6a4bb69a adds environment variable that disables/enables the creation of new team when user sign up 2017-10-25 15:29:04 +02:00
zmagod 4de335d189 add whacamole configuration [fixes SCI-1683] 2017-10-25 09:47:26 +02:00
Zanz2 19b9da2e83 deleted comment 2017-10-24 19:44:34 +02:00
Zanz2 49501b3d3d Finished review refactor 2017-10-24 19:24:53 +02:00
Luka Murn 8cda449738 Update en.yml 
Remove unneccesary my_module_groups localization Strings.
 2017-10-23 17:49:55 +02:00
Luka Murn 6d76029a57 Merge pull request #840 from biosistemika/release-1.12.5 
Merge release-1.12.5 into master
 2017-10-20 14:57:47 +02:00
Luka Murn fa4c787c6b Bump version to 1.12.5 2017-10-20 14:13:58 +02:00
Zanz2 03e40017e4 Updated local 2017-10-19 19:58:18 +02:00
okriuchykhin 44733fefda Merge pull request #839 from okriuchykhin/ok_SCI_1609 
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
 2017-10-19 16:26:36 +02:00
Oleksii Kriuchykhin 631b41cdaa Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
Zanz2 ae9ac46472 Put the two blocks of code into seperate partials 2017-10-19 00:13:35 +02:00
Zmago Devetak fd755eedf0 Merge pull request #832 from ZmagoD/zd_SCI_1560 
adds label under protocols keywords input [fixes SCI-1560]
 2017-10-18 14:06:13 +02:00
Zanz2 67b09adaeb Fixed last few rubocop errors 2017-10-17 19:43:46 +02:00
Zanz2 6cf775a4b1 Refactored code, made html render on preview too 2017-10-17 19:27:20 +02:00
okriuchykhin 8e90e041b9 Merge pull request #825 from okriuchykhin/ok_SCI_1665 
Optimize memory usage in samples/repositories import [SCI-1665]
 2017-10-17 17:26:00 +02:00
Oleksii Kriuchykhin cd0aba1896 Change any? to empty? [SCI-1665] 2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin c8d2ae70fa Move duplicated code to service [SCI-1665] 2017-10-17 14:46:16 +02:00
zmagod 30d091dc65 adds label under protocols keywords input [fixes SCI-1560] 2017-10-17 14:10:56 +02:00
Luka Murn 4e06b5c397 Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"" 2017-10-17 13:17:49 +02:00
Luka Murn 533f371984 Merge pull request #830 from biosistemika/revert-820-lm-sci-1675 
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
 2017-10-17 13:13:20 +02:00
Luka Murn 4d8f2665d3 Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]" 2017-10-17 13:10:02 +02:00
okriuchykhin 66e9e60c9d Merge pull request #826 from okriuchykhin/ok_SCI_1689 
Use case insensitive sample types and groups in import [SCI-1689]
 2017-10-16 13:32:04 +02:00
Luka Murn 2fb2b90da3 Merge pull request #820 from Ducz0r/lm-sci-1675 
Add Add-ons page to User -> Settings -> Account [SCI-1675]
 2017-10-16 13:05:43 +02:00
Oleksii Kriuchykhin d266034406 Use case insensitive sample types and groups in import [SCI-1689] 2017-10-13 17:15:51 +02:00
Luka Murn 38bce08b5a Minor wording change. 2017-10-13 09:27:18 +02:00
Zanz2 e72c1bebcb deleted comments 2017-10-12 19:18:22 +02:00
Zanz2 8d0d6f0502 refactored methods 2017-10-12 19:10:16 +02:00
okriuchykhin db9a031581 Merge pull request #813 from okriuchykhin/ok_SCI_1642 
Refactor canvas [SCI-1642]
 2017-10-12 17:45:34 +02:00
Zanz2 21036a1081 Deleted unnecesarry if's 2017-10-12 17:22:02 +02:00
Zanz2 414a15872c Made seperate method for steps mapping 2017-10-12 17:15:43 +02:00
gazvoda 88f03a0706 Merge pull request #735 from gazvoda/lg-SCI-1249-v2 
Truncate checklist items in activity modal [fixes SCI-1249]
 2017-10-12 15:58:05 +02:00
Oleksii Kriuchykhin 56f52ebfa7 Optimize memory usage in samples/repositories import [SCI-1665] 2017-10-12 14:43:25 +02:00
Zanz2 5d667f146e Moved .js form reset and made a standalone description method 2017-10-11 17:59:09 +02:00
Oleksii Kriuchykhin 9a8e33c6d7 Small fixes [SCI-1642] 2017-10-11 17:24:31 +02:00
Luka Murn fe89b942e7 Add Add-ons page to User -> Settings -> Account 
Closes SCI-1675.
 2017-10-11 14:15:37 +02:00
okriuchykhin 0d3cb3a129 Merge pull request #814 from okriuchykhin/ok_GIOT_55 
Remove GIOT sign-in button [GIOT-55]
 2017-10-10 17:04:34 +02:00
okriuchykhin 5364b7d659 Merge pull request #815 from okriuchykhin/ok_GIOT_44 
Add editable field to task in tasks tree API call [GIOT-44]
 2017-10-10 17:04:19 +02:00
Oleksii Kriuchykhin 58c2487eb6 Enable :preserve_files in paperclip config [SCI-1626] 2017-10-10 13:32:14 +02:00
Oleksii Kriuchykhin f8334b3d5b Add editable field to task in tasks tree API call [GIOT-44] 2017-10-09 14:38:33 +02:00
Oleksii Kriuchykhin bd26052110 Remove GIOT sign-in button [GIOT-55] 2017-10-09 11:56:46 +02:00
Zanz2 8720222ac2 Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper) 2017-10-07 22:45:01 +02:00
Zanz2 183c93d21b Refactoring to git review specifications 2017-10-07 22:13:31 +02:00
Zanz2 9655c98566 Github review refactor 2017-10-07 20:47:05 +02:00
Zanz2 3a8092b663 Refactor and threw out useless comments 2017-10-07 18:05:09 +02:00
Zanz2 d52400f741 Refactored code according to review 2017-10-07 17:58:23 +02:00
Zanz2 2b9563ec6d Added preview text to en.yml 2017-10-07 17:45:23 +02:00