Luka Murn
|
f97a8f3238
|
Merge branch 'Ducz0r-lm-sci-1091-fix'
|
2017-03-09 08:52:17 +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
|
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 |
|
zmagod
|
f78ef8c82a
|
fixes hound
|
2017-03-08 14:41:42 +01:00 |
|
zmagod
|
5c2e9a4b04
|
adds extends and fixes report methods
|
2017-03-08 14:14:03 +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
|
0916e7e40d
|
Allow upload of .dot, .pot, .rtf files
Closes SCI-1052.
|
2017-03-06 15:01:32 +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 |
|
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 |
|
zmagod
|
e1b3dcc2ba
|
adds enum extends to report element part of SCI-1003
|
2017-02-27 13:53:46 +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 |
|