Commit graph

162 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 58c2487eb6 Enable :preserve_files in paperclip config [SCI-1626] 2017-10-10 13:32:14 +02:00
Zmago Devetak 7b898666da Merge pull request #745 from ZmagoD/zd_SCI_1485
refactor repositories js files [fixes SCI-1485]
2017-07-19 11:17:52 +02:00
zmagod a2b7bcda4c refactor repositories js files [fixes SCI-1485] 2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin 036ee390ed Fix error messages in repository import and uploading files starting with hyphen[SCI-1484] 2017-07-14 16:19:03 +02:00
Luka Murn 1dc3e49367 Merge pull request #739 from Ducz0r/lm-sci-1432
Extend confirmation period of emails to 7 days [SCI-1432]
2017-07-11 10:57:16 +02:00
Luka Murn 19a8dfe116 Extend confirmation period of emails to 7 days
Closes SCI-1432.
2017-07-11 08:32:52 +02:00
Luka Murn 16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Luka Murn 9a19cb711f Version bump to 1.12.1 2017-07-04 08:00:32 +02:00
Zmago Devetak d726c121bc Version bump to 1.12.0 2017-06-23 12:37:19 +02:00
Mojca Lorber b6f146f177 fix cog position on repositories page 2017-06-16 11:54:31 +02:00
Luka Murn e0828657b3 Somebody kill the Hound please 2017-06-08 11:23:24 +02:00
Luka Murn 9bfbf3b634 Minor fix #2 2017-06-08 11:22:27 +02:00
Luka Murn b729c06f31 Minor fix 2017-06-08 11:20:11 +02:00
Luka Murn 0aee11d6d8 Hound is love, Hound is life #2 2017-06-07 18:26:32 +02:00
Luka Murn 42f7b4f68d Hound is love, Hound is life 2017-06-07 18:22:15 +02:00
Luka Murn 02dd6636ba Allow saving & editing of reports with repository elements
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn b5f6d1da94 Allow custom repositories to be added to reports 2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin 8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Mojca Lorber 51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber 13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn fcc3995049 Merge pull request #647 from biosistemika/master
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +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
Mojca Lorber 9ae615264d add global repositories screen - tab control 2017-05-22 17:54:30 +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
Oleksii Kriuchykhin 72a651c7de Add migrations and models for custom repositories [SCI-1267] 2017-05-16 15:27:36 +02:00
Oleksii Kriuchykhin 5d55720aad Fix steps ordering in reports [SCI-1008] 2017-05-11 15:56:33 +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 0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
Matej Zrimšek 2c76ba9471 Added date format constant. [Fixes SCI-1205] 2017-04-25 16:37:09 +02:00
Luka Murn 61af70668c Bump version to 1.10.0 2017-04-19 09:31:40 +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 d8c00401cd Update constants.rb
Bump version to 1.9.1
2017-04-11 09:10:55 +02:00
Luka Murn a30c7a77e8 Silence Wicked PDF generation
Closes SCI-1107.
2017-04-10 14:00:31 +02:00
zmagod 9610c5f5a0 fix info dropdown links [fixes SCI-1141] 2017-04-07 11:31:09 +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
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
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 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 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 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
zmagod 49f91184da fixes locals 2017-03-09 09:55:15 +01:00