Commit graph

419 commits

Author SHA1 Message Date
zmagod
b22350136f adds label to step in report [fixes SCI-488] 2017-05-05 09:45:18 +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
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
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