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

2387 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zmagod 6dd21e87a7 fixes bug with indexes 2017-07-03 14:48:13 +02:00
okriuchykhin 4740564a40 Merge pull request #727 from okriuchykhin/ok_SCI_1445 
Fix ordering of the columns after adding the new ones [SCI-1445]
 2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin 4c6690e59b Fix ordering of the columns after adding the new ones [SCI-1445] 2017-07-03 11:53:15 +02:00
gazvoda b10e2aa34b Merge pull request #726 from biosistemika/lg-SCI-1430 
Added data hook and form id for GA tracking [SCI-1430]
 2017-07-03 11:34:15 +02:00
lenart 74e723d5d5 Changed data hook name and form id [SCI-1430] 2017-07-03 11:28:35 +02:00
Oleksii Kriuchykhin 5c39b90b2d Fix activities button misbehaviour with turbolinks [SCI-1412] 2017-06-30 16:33:52 +02:00
zmagod bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
lenart 8ec458db91 Added data hook and form id for GA tracking [SCI-1430] 2017-06-30 10:06:54 +02:00
Mojca Lorber a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Zmago Devetak 29413f2e55 Merge pull request #724 from ZmagoD/zd_SCI_1410 
Fix Repeat Tutorial Action / Tutorial
 2017-06-29 13:56:26 +02:00
Mojca Lorber 4fb07e1e4f fix edit comments 2017-06-29 13:33:59 +02:00
Mojca Lorber 2ab74c8979 add user variable 2017-06-29 12:56:14 +02:00
zmagod 68cfac4a38 adds images into assets folder 2017-06-29 11:04:31 +02:00
zmagod fd13921720 fixes repeat tutorial [fixes SCI-1410] 2017-06-29 11:00:50 +02:00
zmagod bef5a085c4 Fixes bugs on canvas [fixes SCI-1408] 2017-06-29 10:29:41 +02:00
okriuchykhin f56e972ce6 Merge pull request #720 from okriuchykhin/ok_SCI_1411 
Fix global search [SCI-1411]
 2017-06-29 09:55:56 +02:00
Mojca Lorber 21b4ba7627 fix bugs on projects page 2017-06-28 17:15:09 +02:00
Oleksii Kriuchykhin 16a68bbaee Fix hound [SCI-1412] 2017-06-28 17:02:37 +02:00
Oleksii Kriuchykhin e474cda03a Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
Zmago Devetak b830be3ec6 Merge pull request #719 from ZmagoD/zd_SCI_1395 
fixes experiment page [fixes SCI-1395]
 2017-06-28 15:58:00 +02:00
Oleksii Kriuchykhin 21cce4baa0 Fix global search [SCI-1411] 2017-06-28 15:44:18 +02:00
Zmago Devetak 502eb5c211 fixes tabs 2017-06-28 15:40:15 +02:00
zmagod d8a3fdea20 fixes hound 2017-06-28 15:29:10 +02:00
zmagod 525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod a9f38962bc Fixes error message [fixes SCI-1129] 2017-06-28 11:17:50 +02:00
mz3944 6b1fb96f25 Merge pull request #717 from mz3944/mz-SCI-1419 
Fixed sample types page load error, when viewing them on a task levl [SCI-1419]
 2017-06-28 09:05:31 +02:00
Matej Zrimšek 4dbf5b0f53 Fixed sample types page load error, when viewing them on a task level. [SCI-1419] 2017-06-27 16:28:25 +02:00
Zmago Devetak f7cef48f9f Merge pull request #709 from ZmagoD/zd_SCI_1388 
Upgrate to Rails 5.1
 2017-06-27 15:57:14 +02:00
zmagod 71aa05bb0e refactor 2017-06-27 14:58:49 +02:00
mlorb 025050a7cd Merge pull request #716 from mlorb/ml-sci-1420 
Add tooltips to navigation bar [SCI-1420]
 2017-06-27 14:52:07 +02:00
Mojca Lorber d03be76f35 add tooltips to archive buttons 2017-06-27 14:48:45 +02:00
Mojca Lorber 0160956377 put all titles on links 2017-06-27 14:21:06 +02:00
Mojca Lorber 6bfb5e125c add tooltips to navigation bar 2017-06-27 13:46:49 +02:00
okriuchykhin d126391940 Merge pull request #710 from okriuchykhin/ok_SCI_1356 
Add global search in custom repositories [SCI-1356]
 2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin 69231060b0 Fix checking of my_modules presence [SCI-1356] 2017-06-27 13:39:08 +02:00
Zmago Devetak 6c541602e7 Merge pull request #715 from ZmagoD/zd_SCI_1328_v2 
fixes smart annotations bug in reports [fixes SCI-1328]
 2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin 4060ba2ac3 Code style fixes [SCI-1356] 2017-06-27 13:23:51 +02:00
mz3944 ca59ac5e36 Merge pull request #714 from mz3944/mz-SCI-1402 
Missing error message when not selecting name in case of import repository file [SCI-1402]
 2017-06-27 11:54:26 +02:00
zmagod 7b9410f02f fixes smart annotations bug in reports [fixes SCI-1328] 2017-06-27 11:26:32 +02:00
okriuchykhin ee2cc006af Merge pull request #712 from okriuchykhin/ok_SCI_1404 
Fix naming of repository items in modal and messages [SCI-1404]
 2017-06-27 09:22:43 +02:00
okriuchykhin 8ae479b370 Merge pull request #713 from okriuchykhin/ok_SCI_1399 
Remove spinner after samples import error [SCI-1399]
 2017-06-27 09:22:21 +02:00
okriuchykhin 38724cf78e Merge pull request #711 from okriuchykhin/ok_SCI_1415 
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
 2017-06-27 09:17:51 +02:00
Oleksii Kriuchykhin 938896981d Remove spinner after samples import error [SCI-1399] 2017-06-26 16:51:58 +02:00
Matej Zrimšek f847b44067 Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402] 2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin 84556cf744 Fix naming of repository items in modal and messages [SCI-1404] 2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin f2f57de264 Fix changing protocol ownership logic when removing user from the team [SCI-1415] 2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin fc72453a5b Fix hound warning [SCI-1356] 2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin e038bc58fa Add global search in custom repositories [SCI-1356] 2017-06-23 16:12:56 +02:00
zmagod 819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Zmago Devetak d726c121bc Version bump to 1.12.0 2017-06-23 12:37:19 +02:00