mlorb
|
872f712be8
|
Merge branch 'custom-repositories' into ml_sci_1266_v2
|
2017-05-23 11:05:25 +02:00 |
|
mz3944
|
6b8c8deb16
|
Merge pull request #634 from mz3944/mz-SCI-414
Uncompleted steps not added to Reports
|
2017-05-23 09:58:05 +02:00 |
|
mz3944
|
9fe3b717c8
|
Merge pull request #626 from mz3944/mz-SCI-487
Simplify "Add contents to report" popup
|
2017-05-23 09:57:39 +02:00 |
|
Mojca Lorber
|
9ae615264d
|
add global repositories screen - tab control
|
2017-05-22 17:54:30 +02:00 |
|
Oleksii Kriuchykhin
|
e99e3edb7b
|
Add repositories dropdown to task navigation [SCI-1273]
|
2017-05-18 14:21:00 +02:00 |
|
Luka Murn
|
4c5d7267ac
|
Version bump to 1.11.0
|
2017-05-18 13:48:02 +02:00 |
|
Matej Zrimšek
|
f78c80b148
|
Added possibility to add uncompleted steps to report. [closes SCI-414]
|
2017-05-17 13:25:21 +02:00 |
|
zmagod
|
b8b47542a6
|
fix label [fixes SCI-1240]
|
2017-05-16 16:08:29 +02:00 |
|
Oleksii Kriuchykhin
|
72a651c7de
|
Add migrations and models for custom repositories [SCI-1267]
|
2017-05-16 15:27:36 +02:00 |
|
zmagod
|
e0397f8a54
|
fix search label [fixes SCI-1285]
|
2017-05-16 14:58:39 +02:00 |
|
Matej Zrimšek
|
dbb79ebab1
|
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
|
2017-05-15 17:43:12 +02:00 |
|
Matej Zrimšek
|
27cfd55ea5
|
Simplified popup modal for adding contents to report. [fixes SCI-487]
|
2017-05-15 17:43:12 +02:00 |
|
zmagod
|
01972ab6a7
|
changes load protocol label [fixes SCI-1240]
|
2017-05-15 15:22:43 +02:00 |
|
okriuchykhin
|
a8bbc3c3ba
|
Merge pull request #615 from okriuchykhin/ok_SCI_1008
Fix task and step ordering in reports [SCI-1008]
|
2017-05-12 16:44:57 +02:00 |
|
Oleksii Kriuchykhin
|
bb8c7c342c
|
Add additional info to samples info modal [SCI-960]
|
2017-05-11 22:20:06 +02:00 |
|
Oleksii Kriuchykhin
|
5d55720aad
|
Fix steps ordering in reports [SCI-1008]
|
2017-05-11 15:56:33 +02:00 |
|
Zmago Devetak
|
9911c0d148
|
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
replace all ActionController::Base.helpers.sanitize calls with custom…
|
2017-05-11 14:30:26 +02:00 |
|
zmagod
|
80a0af8c9f
|
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
|
2017-05-11 11:36:47 +02:00 |
|
Oleksii Kriuchykhin
|
229693ec61
|
Fix root_url method unavailable in application_helper [SCI-1252]
|
2017-05-10 18:15:08 +02:00 |
|
ajugo
|
e7c970f287
|
Wording in activity for completion of checklist item [SCI-274] (#601)
|
2017-05-10 10:13:59 +02:00 |
|
okriuchykhin
|
ccc640f2bc
|
Merge pull request #593 from okriuchykhin/ok_SCI_1158
Add advanced search options [SCI-1158]
|
2017-05-09 10:23:34 +02:00 |
|
gazvoda
|
596b296c84
|
Merge pull request #597 from gazvoda/lg-SCI-1104
Added additional explanation text [fixes SCI-1104]
|
2017-05-09 08:41:52 +01:00 |
|
gazvoda
|
e98d6a4da6
|
Merge pull request #596 from gazvoda/lg-SCI-723
Added team icon on the first step of tutorial after the Team icon tex…
|
2017-05-08 14:57:56 +01:00 |
|
osboxes.org
|
c43eacdb98
|
Added additional explanation text [fixes SCI-1104]
|
2017-05-08 15:35:53 +02:00 |
|
gazvoda
|
e462482566
|
Merge pull request #595 from gazvoda/lg-SCI-1239
Corrected number of expiration days in message [fixes SCI-1239]
|
2017-05-08 13:52:23 +01:00 |
|
osboxes.org
|
ea0934a8cb
|
Added team icon on the first step of tutorial after the Team icon text [solves SCI-723]
|
2017-05-08 14:43:35 +02:00 |
|
osboxes.org
|
ddbd568166
|
Corrected number of expiration days in message [fixes SCI-1239]
|
2017-05-08 13:08:53 +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
|
0ee7e11620
|
Add advanced search options [SCI-1158]
|
2017-05-05 16:41:23 +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 |
|
zmagod
|
b22350136f
|
adds label to step in report [fixes SCI-488]
|
2017-05-05 09:45:18 +02:00 |
|
zmagod
|
acc5594f1b
|
add popup for approval to complete the Task [fixes SCI-1200]
|
2017-05-04 12:41:22 +02:00 |
|
mz3944
|
37eef683eb
|
Merge pull request #575 from mz3944/mz-SCI-1205
Added date format constant. [Fixes SCI-1205]
|
2017-04-26 14:30:23 +02:00 |
|
Matej Zrimšek
|
2c76ba9471
|
Added date format constant. [Fixes SCI-1205]
|
2017-04-25 16:37:09 +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 |
|
Luka Murn
|
92159b734f
|
Merge pull request #559 from Ducz0r/lm-sci-1175-fix
Fix encoding when cloning tables [SCI-1175]
|
2017-04-25 14:38:34 +02:00 |
|
zmagod
|
66f43803c0
|
refactor, fix user annotation bug
|
2017-04-24 16:22:25 +02:00 |
|
zmagod
|
550f563666
|
working version for steps first run
|
2017-04-21 16:09:04 +02:00 |
|
Mojca Lorber
|
0bae4657f6
|
add experiment level to user smart annotation notification
|
2017-04-20 13:21:02 +02:00 |
|
Luka Murn
|
61af70668c
|
Bump version to 1.10.0
|
2017-04-19 09:31:40 +02:00 |
|
zmagod
|
c25df63a14
|
add tinymce img importer and refactor input sanitize helper
|
2017-04-19 09:11:52 +02:00 |
|
mz3944
|
0ebf294844
|
Merge pull request #562 from mz3944/mz-SCI-1187
Added general locale for cases when a name is optional and is not spe…
|
2017-04-18 15:26:35 +02:00 |
|
mlorb
|
aab6a9b7a4
|
Merge pull request #561 from mlorb/ml_sci_1198
Change mentions for user smart annotations in notifications [SCI-1198]
|
2017-04-18 09:42:38 +02:00 |
|
mlorb
|
39f0ec9d24
|
Merge pull request #557 from mlorb/ml_sci_1118
Rename cloning text [SCI-1118]
|
2017-04-18 09:42:05 +02:00 |
|
Matej Zrimšek
|
c8ba234023
|
Added general locale for cases when a name is optional and is not specified. [fixes SCI-1187]
|
2017-04-14 17:20:34 +02:00 |
|
Mojca Lorber
|
34cfe01152
|
change mentions for user smart annotations in notifications
|
2017-04-14 16:23:49 +02:00 |
|
Mojca Lorber
|
56efb8086f
|
rename the rest of cloning text
|
2017-04-13 17:52:32 +02:00 |
|
Luka Murn
|
9c28608fbf
|
Fix encoding when cloning tables
Closes SCI-1175.
|
2017-04-13 17:00:27 +02:00 |
|
Mojca Lorber
|
5f02376da3
|
rename cloning text
|
2017-04-13 15:09:17 +02:00 |
|
zmagod
|
53e828566a
|
change system notification description
|
2017-04-13 14:01:52 +02:00 |
|
zmagod
|
f104444a0c
|
adds additional explanations [fixes SCI-1103]
|
2017-04-12 16:56:47 +02:00 |
|
Zmago Devetak
|
9c31239318
|
Merge pull request #552 from biosistemika/release-1.9.0
Release 1.9.1
|
2017-04-12 13:08:37 +02:00 |
|
Luka Murn
|
3d9323c8d7
|
Merge pull request #547 from Ducz0r/lm-sci-1107
Silence Wicked PDF generation [SCI-1107]
|
2017-04-11 11:22:49 +02:00 |
|
Luka Murn
|
d8c00401cd
|
Update constants.rb
Bump version to 1.9.1
|
2017-04-11 09:10:55 +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
|
a30c7a77e8
|
Silence Wicked PDF generation
Closes SCI-1107.
|
2017-04-10 14:00:31 +02:00 |
|
zmagod
|
d2eb7be426
|
removed faq label
|
2017-04-10 11:23:50 +02:00 |
|
zmagod
|
90faeec410
|
fixes typos and protocol step links
|
2017-04-10 11:21:28 +02:00 |
|
zmagod
|
9610c5f5a0
|
fix info dropdown links [fixes SCI-1141]
|
2017-04-07 11:31:09 +02:00 |
|
zmagod
|
9a17648eee
|
Adds new relic in sciNote [fixes SCI-1183]
|
2017-04-07 11:23:45 +02:00 |
|
zmagod
|
439cd0cd89
|
add notification to experiments
|
2017-04-06 14:55:18 +02:00 |
|
zmagod
|
046b608018
|
add notification for my_module/project comments
|
2017-04-06 14:07:22 +02:00 |
|
zmagod
|
f16607579f
|
refactor steps annotation
|
2017-04-06 13:03:13 +02:00 |
|
zmagod
|
bb437bd8c5
|
adds notification to results annotation
|
2017-04-06 09:33:49 +02:00 |
|
zmagod
|
d331911ffe
|
completed step annotations
|
2017-04-06 08:42:16 +02:00 |
|
okriuchykhin
|
b781ebd6fe
|
Merge pull request #536 from okriuchykhin/ok_SCI_1166
Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166]
|
2017-04-05 09:55:39 +02:00 |
|
Oleksii Kriuchykhin
|
ba4dbe49f8
|
Whitelist application/zip file type in paperclip for some .xlsx files [SCI-1166]
|
2017-04-04 10:51:54 +02:00 |
|
zmagod
|
e016bda9d2
|
adds expired days in constant
|
2017-04-04 10:16:54 +02:00 |
|
zmagod
|
99c116f257
|
first run
|
2017-04-04 09:19:43 +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
|
6a4faf8765
|
add color constants
|
2017-03-31 13:24:08 +02:00 |
|
okriuchykhin
|
d39940efea
|
Merge pull request #526 from okriuchykhin/ok_SCI_1096
Add docker files for running in production mode [SCI-1096]
|
2017-03-30 10:40:50 +02:00 |
|
zmagod
|
0096f9dc14
|
refactor
|
2017-03-29 09:32:23 +02:00 |
|
Oleksii Kriuchykhin
|
a7be37ef67
|
Add docker files for running in production mode [SCI-1096]
|
2017-03-27 14:36:20 +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 |
|
zmagod
|
2235fd3fb7
|
adds view if download expires
|
2017-03-27 10:38:28 +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
|
4635a3320d
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
|
2017-03-24 16:09:28 +01:00 |
|
zmagod
|
f380e08ab0
|
fixed hound
|
2017-03-24 12:42:50 +01:00 |
|
zmagod
|
023b3213e8
|
fixes email link [fixes SCI-765]
|
2017-03-24 12:10:07 +01:00 |
|
zmagod
|
94732c6d18
|
adds delayed zip generator
|
2017-03-23 15:45:02 +01:00 |
|
Luka Murn
|
541998bde6
|
Bump version to 1.9.0
|
2017-03-23 14:37:47 +01:00 |
|
zmagod
|
4385c68f5f
|
adds zip_export utility first run
|
2017-03-21 16:15:11 +01:00 |
|
Oleksii Kriuchykhin
|
8a8720fcfe
|
Add missing translation for protocol load [SCI-1125]
|
2017-03-21 15:07:59 +01:00 |
|
Mojca Lorber
|
83fa8570d7
|
refactoring
|
2017-03-17 17:52:15 +01:00 |
|
Oleksii Kriuchykhin
|
d17eb2b3f7
|
Add missing translations for samples assign/unassign activities [SCI-1114]
|
2017-03-17 14:15:50 +01:00 |
|
zmagod
|
856a4611c6
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
|
2017-03-14 15:58:08 +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 |
|
zmagod
|
1d42d46c02
|
fixes bug with step comments
|
2017-03-09 16:02:52 +01:00 |
|
zmagod
|
3057965940
|
fix bug with filenames
|
2017-03-09 11:48:50 +01:00 |
|
zmagod
|
9939d8df06
|
refactor
|
2017-03-09 10:51:54 +01:00 |
|
Luka Murn
|
1026700b40
|
Merge pull request #509 from biosistemika/lm-sci-1052-fix
Allow upload of .dot, .pot, .rtf files [SCI-1052]
|
2017-03-09 10:47:19 +01:00 |
|
zmagod
|
49f91184da
|
fixes locals
|
2017-03-09 09:55:15 +01:00 |
|
zmagod
|
5c2e9a4b04
|
adds extends and fixes report methods
|
2017-03-08 14:14:03 +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
|
473487faec
|
Add HTML <head><title> to edit, view file pages
Closes SCI-1049.
|
2017-03-06 13:55:07 +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 |
|