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
5133 commits 70 branches 179 tags 165 MiB
Commit graph

5133 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jure Grabnar 171b2eeedc Remove the title of protocol steps when empty 
Closes SCI-3072
 2019-03-25 09:36:56 +01:00
aignatov-bio e8827b0d74
Update tags in task info [SCI-3093] (#1575) 
* Adding inline tags selection
 2019-03-21 10:13:07 +01:00
Alex Kriuchykhin 840f4a9eb0
Merge pull request #1573 from okriuchykhin/ok_SCI_3111 
Re-enable RTE for steps description fields [SCI-3111].
 2019-03-20 14:51:17 +01:00
Oleksii Kriuchykhin 0c2b7959b6 Fix smart annotations in RTE [SCI-3111] 2019-03-20 11:41:36 +01:00
Oleksii Kriuchykhin b46f3566ef Fix rendering of HTML in RTE fields [SCI-3111] 2019-03-19 23:32:24 +01:00
Oleksii Kriuchykhin eb3d1ea6fe Update RTE for step description [SCI-3111] 2019-03-19 17:42:49 +01:00
Alex Kriuchykhin 7db53fad7c
Merge pull request #1566 from okriuchykhin/ok_SCI_3062 
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
 2019-03-19 13:28:05 +01:00
Oleksii Kriuchykhin 5bc41c1f06 Fix task tags field after merging latest master to feature branch 2019-03-15 14:21:34 +01:00
Oleksii Kriuchykhin ba41afe449 Re-orginize TinyMCE init callback [SCI-3062][SCI-3071] 2019-03-15 11:07:57 +01:00
Oleksii Kriuchykhin 2cc170c3d4 Close RTE on save [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin 645930b8d7 Merge branch 'master' into features/note-section 2019-03-14 16:25:51 +01:00
Oleksii Kriuchykhin 06b5667ec5 Update VERSION to 1.15.8 2019-03-14 11:12:41 +01:00
Alex Kriuchykhin 81a25d9f84
Merge pull request #1564 from okriuchykhin/rails_update 
Update Rails to 5.1.6.2
 2019-03-14 09:56:00 +01:00
Oleksii Kriuchykhin 0b0141de5f Update Rails to 5.1.6.2 2019-03-13 20:32:29 +01:00
Miha Mencin 70f7161c65
Update version 2019-03-13 14:45:07 +01:00
Alex Kriuchykhin bb29a97962
Merge pull request #1557 from okriuchykhin/ok_SCI_3151 
Improve JS files inclusion in export all [SCI-3151]
 2019-03-07 17:46:45 +01:00
Oleksii Kriuchykhin af9daf3a5e Improve JS files inclusion in export all [SCI-3151] 2019-03-07 17:42:47 +01:00
Alex Kriuchykhin ec1aec3bf1
Merge pull request #1556 from okriuchykhin/ok_SCI_3048 
Fix local storage file download links [SCI-3048]
 2019-03-07 16:58:30 +01:00
Oleksii Kriuchykhin 0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +01:00
Alex Kriuchykhin 3da3ef0e8e
Merge pull request #1555 from okriuchykhin/ok_SCI_3151 
Embed tables JS files to main HTML of Export All [SCI-3151]
 2019-03-07 14:34:28 +01:00
Oleksii Kriuchykhin 8cc95bf491 Embed tables JS files to main HTML of Export All [SCI-3151] 2019-03-07 14:23:10 +01:00
Alex Kriuchykhin d5110a4f87
Merge pull request #1554 from okriuchykhin/ok_SCI_3150 
Fix JS files inclusion in export all report [SCI-3150]
 2019-03-07 11:17:51 +01:00
Oleksii Kriuchykhin 2b239e2f35 Fix JS files inclusion in export all report [SCI-3150] 2019-03-07 11:14:38 +01:00
Luka Murn 4e2b971e9b
Update VERSION to 1.15.6 2019-03-06 10:43:52 +01:00
aignatov-bio 125d2a3b9b
New inline tags editing in task [SCI 3093] (#1529) 
* Adding inline tags selection
 2019-03-06 09:18:45 +01:00
aignatov-bio b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) 
* Adding inline editing to experiment title, project title and task title
 2019-03-06 09:17:34 +01:00
Miha Mencin 8fbda40c49
Merge pull request #1552 from biosistemika/mm-sci-3119-create-templates-at-login 
put the scheduling logic into session create action
 2019-03-05 10:56:48 +01:00
Miha Mencin 9807c80286 move the create action to the tope section of controller 2019-03-05 10:49:36 +01:00
Miha Mencin 67fe486874 put the scheduling logic into session create action 2019-03-05 10:43:39 +01:00
aignatov-bio 6dcaea973d
Merge pull request #1550 from aignatov-bio/ai-sci-3123-keep-title-bold 
Bold text for read messages SCI-3123
 2019-03-05 10:30:16 +01:00
Miha Mencin 0bd40dca4e
Merge pull request #1549 from biosistemika/mm-sci-3119-create-templates-at-login 
Prepare a mechanism to schedule the template creation at user login
 2019-03-05 09:24:23 +01:00
Miha Mencin 6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin fa7bba9de7 scheduling creation of demo project at the sign in time 
remove wrong schema, fix comment, add migration
 2019-03-04 18:26:15 +01:00
Anton Ignatov 33682bb561 Bold text for read messages 2019-03-04 13:48:25 +01:00
Miha Mencin 2ba040980f reverting the team changes, the scope is not needed 2019-03-01 17:48:38 +01:00
Miha Mencin 844303ae7c SCI-3119 schedule the creaton of template 2019-03-01 17:47:04 +01:00
Miha Mencin b501327c87
Update version 2019-03-01 15:30:31 +01:00
aignatov-bio d69f8c5636
Merge pull request #1547 from aignatov-bio/ai-sci-3114-recapthca-bug 
Remove script from modal SCI-3114
 2019-03-01 14:58:49 +01:00
Anton Ignatov f636b5adff Remove script from modal 2019-03-01 14:56:06 +01:00
aignatov-bio 9a007b5d75
Merge pull request #1542 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity 
Fix missing user name in activty, when moving experiment [SCI-3108]
 2019-03-01 14:16:59 +01:00
Alex Kriuchykhin 985820a97c
Merge pull request #1527 from okriuchykhin/ok_SCI_3101 
Move templates project creation for new team to delayed job [SCI-3101]
 2019-03-01 13:55:49 +01:00
Alex Kriuchykhin 09ed7922da
Merge pull request #1543 from okriuchykhin/ok_SCI_3107 
Improve speed of index query in projects overview service [SCI-3107]
 2019-03-01 13:53:56 +01:00
aignatov-bio bf9c571c09
Merge pull request #1546 from aignatov-bio/ai-sci-3114-recapthca-bug 
Fix the issues we were having with reCAPTCHA on the the February lauch day [SCI - 3114]
 2019-03-01 13:28:45 +01:00
Anton Ignatov 1ae4a60f79 Fix recaptha error 2019-03-01 12:58:31 +01:00
Oleksii Kriuchykhin 1fedb4c91e Improve speed of index query in projects overview service [SCI-3107] 2019-02-28 17:46:34 +01:00
Anton Ignatov 9e472c0ccf Fix missing user name in activty, when moving experiment 2019-02-28 16:06:23 +01:00
Miha Mencin 1ef8108521
update version to 1.15.4 2019-02-28 13:01:59 +01:00
Miha Mencin 20db41d361
Merge pull request #1540 from biosistemika/sci-3112-change-the-comments 
SCI-3112 Change the the comments in demo project generator
 2019-02-28 11:43:20 +01:00
Miha Mencin 4f9daa9590 SCI-3112 Change the the comments in demo project generator 2019-02-28 11:39:44 +01:00