Oleksii Kriuchykhin
|
bd5a48b9c8
|
Improve code style [SCI-1158]
|
2017-05-08 18:00:14 +02:00 |
|
Oleksii Kriuchykhin
|
344b9c290a
|
Add counters for users and comments on canvas [SCI-152]
|
2017-05-08 17:32:55 +02:00 |
|
okriuchykhin
|
f292dab3b5
|
Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2
Change color of loading animation in reports [SCI-1029]
|
2017-05-08 13:35:00 +02:00 |
|
Zmago Devetak
|
4b816f5322
|
Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
|
2017-05-08 13:06:58 +02:00 |
|
Oleksii Kriuchykhin
|
3f60439948
|
Change color of loading animation in reports [SCI-1029]
|
2017-05-08 11:02:51 +02:00 |
|
Oleksii Kriuchykhin
|
0ee7e11620
|
Add advanced search options [SCI-1158]
|
2017-05-05 16:41:23 +02:00 |
|
mlorb
|
4c85ac7bf5
|
Merge pull request #588 from mlorb/ml_sci_191
Add information how many samples are selected [SCI-191]
|
2017-05-05 15:24:16 +02:00 |
|
Zmago Devetak
|
de3d1172c1
|
Merge pull request #584 from ZmagoD/zd_SCI_1200
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-05 14:57:27 +02:00 |
|
Mojca Lorber
|
45baba1803
|
fix zmago the hound
|
2017-05-04 16:46:52 +02:00 |
|
Mojca Lorber
|
ad9497a638
|
add information how many samples are selected
|
2017-05-04 16:30:29 +02:00 |
|
zmagod
|
f784844472
|
fixes bug with empty checklist item [fixes SCI-1233]
|
2017-05-04 16:15:00 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
Mojca Lorber
|
f8f6a5f63a
|
fix bug edit canvas not working and fix positioning of cloned task/workflow
|
2017-05-04 10:54:50 +02:00 |
|
zmagod
|
5b58824ec0
|
refactor
|
2017-05-03 15:30:08 +02:00 |
|
ajugo
|
41df727e57
|
Merge pull request #569 from rekonder/aj-SCI-1130
Fix error with close on reports
|
2017-05-03 12:27:42 +02:00 |
|
ajugo
|
081aa4aea7
|
Merge pull request #570 from rekonder/aj-SCI-1088
My profile - avatar size fix [SCI-1088]
|
2017-05-03 12:27:05 +02:00 |
|
Oleksii Kriuchykhin
|
d3fb688fce
|
Change color of turbolinks progress bar [SCI-1029]
|
2017-04-26 15:04:29 +02:00 |
|
Matej Zrimšek
|
8ad52354eb
|
Used locales instead of hardcoded values for intro.js tutorial popup.
|
2017-04-25 16:03:50 +02:00 |
|
Matej Zrimšek
|
e8bc9542cc
|
Removed some unneeded intro.js tutorial code.
|
2017-04-25 16:03:50 +02:00 |
|
Matej Zrimšek
|
a6573bd508
|
Next button is now always focused when navigating through tutorial steps. [fixes SCI-719]
|
2017-04-25 16:03:50 +02:00 |
|
Matej Zrimšek
|
a5cffd06f3
|
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
|
2017-04-25 16:03:50 +02:00 |
|
Mojca Lorber
|
49574e7a06
|
remove behavior of not allowing the empty tables in steps
|
2017-04-25 10:21:16 +02:00 |
|
rekonder
|
b93edac3b9
|
My profile - avatar size fixes [SCI-1088]
|
2017-04-25 10:02:00 +02:00 |
|
zmagod
|
66f43803c0
|
refactor, fix user annotation bug
|
2017-04-24 16:22:25 +02:00 |
|
rekonder
|
dc46a7b650
|
Fix error with close on reports
|
2017-04-24 16:02:30 +02:00 |
|
zmagod
|
55c8c498e2
|
add image upload functionality to result text
|
2017-04-24 12:28:27 +02:00 |
|
zmagod
|
550f563666
|
working version for steps first run
|
2017-04-21 16:09:04 +02:00 |
|
Mojca Lorber
|
cf00ecd62e
|
new experiment redirection
|
2017-04-20 17:55:28 +02:00 |
|
zmagod
|
c25df63a14
|
add tinymce img importer and refactor input sanitize helper
|
2017-04-19 09:11:52 +02:00 |
|
Matej Zrimšek
|
57b6b9402d
|
Experiment description is inside of box for every supported browser. [fixes SCI-860]
|
2017-04-18 16:44:01 +02:00 |
|
okriuchykhin
|
3d805d529d
|
Merge pull request #554 from okriuchykhin/ok_SCI_877
Add image preview to protocol repository [SCI-877]
|
2017-04-18 08:58:39 +02:00 |
|
Zmago Devetak
|
cb1ad9e0be
|
Merge pull request #555 from ZmagoD/zd_SCI_1103
adds additional explanations [fixes SCI-1103]
|
2017-04-13 15:15:08 +02:00 |
|
zmagod
|
0987cf8abc
|
fixes hound alerts
|
2017-04-13 14:55:18 +02:00 |
|
mlorb
|
ddc0e86c92
|
Merge pull request #556 from mlorb/ml_sci_1174
Fix bug with changing user own role from admin to normal user [SCI-1174]
|
2017-04-13 14:33:58 +02:00 |
|
Zmago Devetak
|
ec60044949
|
Merge pull request #548 from ZmagoD/zd_SCI_1129_v2
Disables annimateSpiner in result assets actions
|
2017-04-13 14:06:50 +02:00 |
|
zmagod
|
f104444a0c
|
adds additional explanations [fixes SCI-1103]
|
2017-04-12 16:56:47 +02:00 |
|
Mojca Lorber
|
27c661d7c4
|
fix bug with changing user own role from admin to normal user
|
2017-04-12 16:56:10 +02:00 |
|
Oleksii Kriuchykhin
|
181d981a51
|
Add image preview to protocol repository [SCI-877]
|
2017-04-12 16:05:38 +02:00 |
|
mlorb
|
2932052628
|
Merge pull request #549 from mlorb/ml_sci_1172
Fix overlapping text in audit trail table [SCI-1172, SCI-1181]
|
2017-04-12 15:10:48 +02:00 |
|
Mojca Lorber
|
b09c18a9bc
|
fix overlaping text in audit trail table
|
2017-04-11 14:29:31 +02:00 |
|
zmagod
|
929d8aab5e
|
disables annimateSpiner in result assets actions
|
2017-04-10 15:40:36 +02:00 |
|
Zmago Devetak
|
91793c295a
|
Merge pull request #542 from ZmagoD/zd_SCI_825
Smart annotations and Notifications
|
2017-04-10 15:10:17 +02:00 |
|
Luka Murn
|
becdd687a6
|
Only require jquery-ui-sortable on samples page
(hopefully) closes SCI-794.
|
2017-04-07 13:05:22 +02:00 |
|
okriuchykhin
|
aa776aaa71
|
Merge pull request #541 from okriuchykhin/ok_SCI_615
Fix moving of the steps after adding a new one [SCI-615]
|
2017-04-06 15:50:01 +02:00 |
|
zmagod
|
f16607579f
|
refactor steps annotation
|
2017-04-06 13:03:13 +02:00 |
|
Oleksii Kriuchykhin
|
5c0197220d
|
Fix moving of the steps after adding a new one [SCI-615]
|
2017-04-06 12:53:21 +02:00 |
|
Mojca Lorber
|
5e62046627
|
remove ERROR from message
|
2017-04-05 14:40:55 +02:00 |
|
Mojca Lorber
|
b222a34a97
|
fix hound
|
2017-04-04 15:38:16 +02:00 |
|
Mojca Lorber
|
715fafe58c
|
fix bug with constants
|
2017-04-03 17:07:58 +02:00 |
|
mlorb
|
317739af1e
|
Merge pull request #530 from biosistemika/ml_sci_1044
Add data-hook and yadcf-filter plug-in [SCI-1044]
|
2017-03-31 14:00:23 +02:00 |
|
Mojca Lorber
|
a2c1ed6994
|
fix constants
|
2017-03-31 13:53:18 +02:00 |
|
Mojca Lorber
|
9458f391e5
|
add data-hook and yadcf-filter plug-in
|
2017-03-29 15:59:51 +02:00 |
|
Zmago Devetak
|
2b35b34eb8
|
Merge pull request #529 from ZmagoD/zd_SCI_1135
fixes alert messages in samples [fixes SCI-1135]
|
2017-03-29 14:57:11 +02:00 |
|
zmagod
|
9ce95470b3
|
fixes alert messages in samples [fixes SCI-1135]
|
2017-03-28 15:14:05 +02:00 |
|
zmagod
|
0996c14449
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
|
2017-03-27 10:41:58 +02:00 |
|
mlorb
|
3beb179f87
|
Merge pull request #514 from biosistemika/ml_sci_1089
Add error messages to sample group/type edit/delete actions [SCI-1089]
|
2017-03-27 09:57:32 +02:00 |
|
zmagod
|
023b3213e8
|
fixes email link [fixes SCI-765]
|
2017-03-24 12:10:07 +01:00 |
|
okriuchykhin
|
33544ec91d
|
Merge pull request #521 from okriuchykhin/ok_SCI_1087
Move flash message creation JS code to helper method [SCI-1087]
|
2017-03-20 15:35:21 +01:00 |
|
Oleksii Kriuchykhin
|
c715902058
|
Move flash message creation JS code to helper method [SCI-1087]
|
2017-03-17 17:58:53 +01:00 |
|
Mojca Lorber
|
83fa8570d7
|
refactoring
|
2017-03-17 17:52:15 +01:00 |
|
zmagod
|
95a0f596b7
|
adds file link
|
2017-03-17 16:40:57 +01:00 |
|
zmagod
|
52878e0989
|
fixed wopi buttons [fixes SCI-1110]
|
2017-03-16 15:38:11 +01:00 |
|
Mojca Lorber
|
4792bd87b9
|
fix error message when editing custom column on locked task
|
2017-03-15 14:09:44 +01:00 |
|
Mojca Lorber
|
7a4e3201e7
|
add error messages to sample group/type edit/delete actions
|
2017-03-14 17:32:25 +01:00 |
|
zmagod
|
7b16e5643e
|
fix assets preprocesor for wopi files
|
2017-03-13 13:20:49 +01:00 |
|
zmagod
|
0c2523beca
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-03-10 16:21:43 +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
|
3599537e42
|
Fix sample type groups edit color script so it works properly now
Closes SCI-1078.
|
2017-03-01 09:09:44 +01:00 |
|
Luka Murn
|
2252b46afc
|
Canvas should now properly work again
Closes SCI-1057.
|
2017-02-28 10:41:55 +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 |
|
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 |
|
zmagod
|
151dc79a81
|
adds hook for lock task action
|
2017-02-21 16:25:50 +01:00 |
|
Mojca Lorber
|
6b30f097f0
|
fix visual bug in edit avatar mode
|
2017-02-21 14:02:42 +01:00 |
|
okriuchykhin
|
8e18ff44a6
|
Merge pull request #479 from okriuchykhin/ok_SCI_999
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-20 15:19:00 +01:00 |
|
Oleksii Kriuchykhin
|
218e96b1f0
|
Code style fixes [SCI-999]
|
2017-02-16 11:45:07 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Luka Murn
|
f7bd62547e
|
Refactor teams settings into its own controllers
|
2017-02-09 14:37:59 +01:00 |
|
Luka Murn
|
5cb3eb5e09
|
Refactor preferences -> move them to subcontroller, subroute
|
2017-02-09 11:07:16 +01:00 |
|
okriuchykhin
|
c2a69982aa
|
Merge pull request #471 from okriuchykhin/ok_SCI_936
Adds datatable to all teams page [SCI-936]
|
2017-02-07 10:33:33 +01:00 |
|
Oleksii Kriuchykhin
|
80dbc669d0
|
Simplify all teams dt definition [SCI-936]
|
2017-02-06 17:17:48 +01:00 |
|
Oleksii Kriuchykhin
|
449f4479e9
|
Fix code style issues [SCI-936]
|
2017-02-06 17:08:20 +01:00 |
|
Oleksii Kriuchykhin
|
916ed2572a
|
Fix smart annotation is missing at editing column with smart annotation [SCI-997]
|
2017-02-03 16:42:38 +01:00 |
|
Oleksii Kriuchykhin
|
62535a01bd
|
Move teams datatable js code into separate file [SCI-936]
|
2017-02-03 10:44:42 +01:00 |
|
Oleksii Kriuchykhin
|
db90c5d63b
|
Add datatable to all teams page [SCI-936]
|
2017-02-02 09:53:59 +01:00 |
|
Mojca Lorber
|
d3e0eca44e
|
redesign individual team page
|
2017-02-01 14:44:47 +01:00 |
|
Zmago Devetak
|
5c9954bb89
|
Merge pull request #450 from ZmagoD/zd_SCI_939
Refactor "organizations" to "teams"
|
2017-02-01 13:12:02 +01:00 |
|
zmagod
|
be5faad97c
|
fixes hound
|
2017-01-31 13:33:55 +01:00 |
|
okriuchykhin
|
9909f9dcff
|
Merge pull request #456 from okriuchykhin/ok_SCI_951
Fix missing preview images in task and protocol management [SCI-951]
|
2017-01-27 14:42:41 +01:00 |
|
okriuchykhin
|
53e09bd50a
|
Merge pull request #457 from okriuchykhin/ok_SCI_955
Fix comments re-initialization after edit of the results [SCI-955]
|
2017-01-27 11:50:52 +01:00 |
|
zmagod
|
e59b2e039a
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
|
2017-01-27 11:15:31 +01:00 |
|
Luka Murn
|
2c3be391a8
|
Merge pull request #462 from ZmagoD/zd_SCI_962_vol2
fix edit action
|
2017-01-26 17:25:57 +01:00 |
|
Luka Murn
|
36f25e98f1
|
Merge pull request #459 from okriuchykhin/ok_SCI_943
Fix RTF toolbar init after eding new step [SCI-943]
|
2017-01-26 17:25:41 +01:00 |
|
zmagod
|
30912c514e
|
fix edit action
|
2017-01-26 17:24:24 +01:00 |
|
zmagod
|
cec5f1333d
|
fixes RTE bug for new text results [fixes SCI-962]
|
2017-01-26 16:54:43 +01:00 |
|
Oleksii Kriuchykhin
|
100cc700c6
|
Fix RTF toolbar init after eding new step [SCI-943]
|
2017-01-26 16:37:44 +01:00 |
|