zmagod
|
0c2523beca
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-03-10 16:21:43 +01:00 |
|
mlorb
|
39e1ac4b26
|
Merge pull request #512 from biosistemika/ml_sci_1074
Fix permissions for experiment actions [SCI-1074]
|
2017-03-10 11:44:27 +01:00 |
|
okriuchykhin
|
2a33391f4b
|
Merge pull request #511 from okriuchykhin/ok_SCI_1090
Refactoring of the comments using STI [SCI-1090]
|
2017-03-10 10:50:43 +01:00 |
|
Mojca Lorber
|
1ba5f1748f
|
fix permissions for experiment actions
|
2017-03-09 17:45:34 +01:00 |
|
Oleksii Kriuchykhin
|
456934464a
|
Remove unneeded validation calls [SCI-1090]
|
2017-03-09 17:20:27 +01:00 |
|
Luka Murn
|
ae96223437
|
Fix rake db:add_user task
|
2017-03-09 15:37:15 +01:00 |
|
Luka Murn
|
1e3a697a91
|
Merge pull request #508 from biosistemika/lm-sci-838-fix
Open edit/view Office files in new browser tab/window [SCI-838]
|
2017-03-09 10:39:16 +01:00 |
|
Luka Murn
|
a4bf5516a5
|
Merge pull request #505 from Ducz0r/lm-sci-1082-fix
Minor change [SCI-1082]
|
2017-03-09 08:58:14 +01:00 |
|
Luka Murn
|
0e8f5f8e99
|
Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix
Conflicts:
app/views/my_modules/_state_buttons.html.erb
|
2017-03-09 08:44:09 +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 |
|
Oleksii Kriuchykhin
|
0f8336e5a5
|
Refactoring of the comments using STI [SCI-1090]
|
2017-03-08 13:18:20 +01:00 |
|
Luka Murn
|
7c9aa2e476
|
Hide complete&uncomplete task buttons if user cannot do it
Closes SCI-1091.
|
2017-03-06 16:01:04 +01:00 |
|
Luka Murn
|
86a800a84e
|
Open edit/view Office files in new browser tab/window
Closes SCI-838.
|
2017-03-06 14:12:18 +01:00 |
|
Luka Murn
|
473487faec
|
Add HTML <head><title> to edit, view file pages
Closes SCI-1049.
|
2017-03-06 13:55:07 +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
|
043613782e
|
Minor change
|
2017-03-02 13:04:13 +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 |
|
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
|
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
|
87599dca88
|
Merge branch 'lm-sci-1026-fix' into release-1.8.1
|
2017-02-23 13:55:41 +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 |
|
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 |
|
Mojca Lorber
|
f84611f558
|
fix report - checklist items are in separate row than checkboxes
|
2017-02-22 15:51:26 +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 |
|
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 |
|