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

1647 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luka Murn ce4afb49f1 Merge pull request #506 from Ducz0r/lm-sci-1073-vol-2 
Fix padding of state buttons [SCI-1073]
 2017-03-08 16:09:17 +01:00
Luka Murn 800df7a26b Also make button icons work when rendering them via JS 
Closes SCI-1073.
 2017-03-08 13:55:10 +01:00
Luka Murn 4ddb139911 Fix padding of state buttons 
Closes SCI-1073.
 2017-03-03 16:36:52 +01:00
Luka Murn 42b773f180 Merge pull request #504 from Ducz0r/lm-sci-1078-fix 
Fix sample type groups edit color script [SCI-1078]
 2017-03-02 13:09:51 +01:00
Luka Murn 808fdf6744 Merge pull request #502 from Ducz0r/lm-sci-1073-fix 
Fix protocol state buttons a bit [SCI-1073]
 2017-03-02 09:02:52 +01:00
Luka Murn 7a48da2e94 Merge pull request #501 from Ducz0r/lm-sci-1057-fix 
Canvas should now properly work again [SCI-1057]
 2017-03-02 09:01:51 +01:00
okriuchykhin a5bae1b19b Merge pull request #503 from okriuchykhin/ok_SCI_1075 
Remove task completion notification generation duplicated code [SCI-1075]
 2017-03-01 16:46:50 +01:00
Luka Murn 3599537e42 Fix sample type groups edit color script so it works properly now 
Closes SCI-1078.
 2017-03-01 09:09:44 +01:00
Oleksii Kriuchykhin 4868ec5331 Remove task completion duplicated code [SCI-1075] 2017-02-28 17:07:59 +01:00
Luka Murn 3d7f09bde6 Fix protocol state buttons a bit 
Closes SCI-1073.
 2017-02-28 14:35:12 +01:00
Luka Murn 2252b46afc Canvas should now properly work again 
Closes SCI-1057.
 2017-02-28 10:41:55 +01:00
Luka Murn 634336e1a4 Merge pull request #499 from biosistemika/lm-test-deface 
Add Deface checking of environmental variables
 2017-02-27 13:17:46 +01:00
Luka Murn 8e09e86a0e Change Deface config so it defaults to 'true' 2017-02-27 12:54:51 +01:00
Luka Murn de8034c5b9 Update environment settings 2017-02-27 09:40:01 +01:00
Luka Murn fecfc9e41d Merge pull request #498 from biosistemika/release-1.8.1 
Release 1.8.1
 2017-02-23 14:57:30 +01:00
Luka Murn dc89c160be Fix a bug with team page not working from user task modal 2017-02-23 14:45:00 +01:00
Luka Murn 98e2a56670 Bump version to 1.8.1 2017-02-23 14:00:46 +01:00
Luka Murn 87599dca88 Merge branch 'lm-sci-1026-fix' into release-1.8.1 2017-02-23 13:55:41 +01:00
Luka Murn cb12bfddc0 Merge pull request #497 from biosistemika/release-1.8.0 
Version bump to 1.8.0
 2017-02-23 11:36:24 +01:00
Luka Murn 52ab6d096f Version bump to 1.8.0 2017-02-23 11:15:26 +01:00
mlorb a72a072fac Merge pull request #495 from mlorb/ml_sci_948 
Fix report - checklist items are in separate row than checkboxes [SCI-948]
 2017-02-23 10:50:48 +01:00
Luka Murn 0a271843a4 Also (temporarily) add this to development.rb 2017-02-23 10:39:34 +01:00
Luka Murn 5a35ab9677 Test Deface change 2017-02-23 09:46:04 +01:00
okriuchykhin 986ad051a1 Merge pull request #496 from okriuchykhin/ok_SCI_873 
Improve image scaling in image preview [SCI-873]
 2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin cb588ed378 Improve image scaling in image preview [SCI-873] 2017-02-22 16:55:57 +01:00
okriuchykhin d30e149936 Merge pull request #493 from okriuchykhin/ok_SCI_739 
Lower z-index value for notification count icon [SCI-739]
 2017-02-22 16:48:39 +01:00
okriuchykhin 75792cde14 Merge pull request #492 from okriuchykhin/ok_SCI_759 
Add more extensive explanation when project name is already taken [SCI-759]
 2017-02-22 16:25:16 +01:00
okriuchykhin c9cabfa04d Merge pull request #494 from okriuchykhin/ok_SCI_734 
Fix tutorial step 26 wording [SCI-734]
 2017-02-22 16:24:54 +01:00
Mojca Lorber f84611f558 fix report - checklist items are in separate row than checkboxes 2017-02-22 15:51:26 +01:00
Oleksii Kriuchykhin 95953e9269 Fix tutorial step 26 wording [SCI-734] 2017-02-22 14:46:38 +01:00
Oleksii Kriuchykhin a326fa374f Lower z-index value for notification count icon [SCI-739] 2017-02-22 14:35:07 +01:00
Zmago Devetak 58f97fdb5b Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook 
adds hook for lock task action
 2017-02-22 14:24:01 +01:00
Oleksii Kriuchykhin 35b0b33ddf Add more extensive explanation when project name is already taken [SCI-759] 2017-02-22 14:18:48 +01:00
mlorb b65c716b79 Merge pull request #491 from biosistemika/ml_sci_1028_v2 
Fix repeat tutorial is always created on the same team [SCI-1028]
 2017-02-22 13:52:46 +01:00
Mojca Lorber 330fe9c291 fix repeat tutorial is always created on the same team 
Closes SCI-1028.
 2017-02-22 13:43:03 +01:00
mlorb 42e6a99911 Merge pull request #487 from mlorb/ml_sci_1032 
Fix visual bug in edit avatar mode [SCI-1032]
 2017-02-22 10:59:18 +01:00
mlorb 8c111db31a Merge pull request #486 from mlorb/ml_sci_1033 
Fix user has no teams view [SCI-1033]
 2017-02-22 10:58:39 +01:00
okriuchykhin dc70bbf99a Merge pull request #488 from okriuchykhin/ok_SCI_1004_v2 
Fix circular dependency while loading Settings [SCI-1004]
 2017-02-22 10:41:57 +01:00
zmagod 151dc79a81 adds hook for lock task action 2017-02-21 16:25:50 +01:00
Mojca Lorber ac0988ef32 add data-hooks for remove manage teams button 2017-02-21 15:39:08 +01:00
Mojca Lorber 0fd41e8a6d remove changes on user has no teams view 2017-02-21 15:12:58 +01:00
Oleksii Kriuchykhin 53ba9437b2 Fix circular dependency while loading Settings [SCI-1004] 2017-02-21 14:38:13 +01:00
mlorb ea1711be83 Merge pull request #485 from mlorb/ml_sci_1001 
Add data-hook for E-signature manifestation/display [SCI-1001]
 2017-02-21 14:25:08 +01:00
mlorb 01d9f306a5 change div to span 2017-02-21 14:22:28 +01:00
Mojca Lorber 6b30f097f0 fix visual bug in edit avatar mode 2017-02-21 14:02:42 +01:00
okriuchykhin 95af5001ab Merge pull request #484 from okriuchykhin/ok_SCI_1004 
Add global settings base class [SCI-1004]
 2017-02-21 13:20:24 +01:00
Mojca Lorber 90864a45a0 fix user has no teams view 2017-02-21 13:08:06 +01:00
Oleksii Kriuchykhin 7703db3386 Change implementation of the Settings base class [SCI-1004] 2017-02-21 13:07:10 +01:00
Luka Murn 6f1c19ae2d Fix _user_dropdown.html.erb 2017-02-21 09:27:42 +01:00
Mojca Lorber cb2127ee7f add data-hook for E-signature manifestation/display 2017-02-20 18:03:55 +01:00