Matej Zrimšek
f847b44067
Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]
2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
84556cf744
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
Zmago Devetak
d726c121bc
Version bump to 1.12.0
2017-06-23 12:37:19 +02:00
Matej Zrimšek
be855e98db
Changed repository records filter naming. [SCI-1398]
2017-06-23 10:16:50 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
mlorb
122ac7971f
Merge pull request #692 from mlorb/ml_sci_1348
...
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
Mojca Lorber
86530bbda0
fix flash text
2017-06-16 14:41:50 +02:00
Mojca Lorber
b6f146f177
fix cog position on repositories page
2017-06-16 11:54:31 +02:00
Mojca Lorber
4566fc7191
fix text in activity for assign/unassign records message
2017-06-15 10:06:12 +02:00
Mojca Lorber
77d922a5e8
change the name of add record/repository in repositories
2017-06-13 09:45:18 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +02:00
Luka Murn
810599bef2
Fix en.yml localization bug
2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +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
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +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
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +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
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Matej Zrimšek
2c6ad4aa05
Refactored modal popups for repositories to make them general. [fix 1269]
2017-06-05 14:13:24 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
21a72da84f
Added rename logic and improved remove logic. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
cdaac6a01b
Added remove repository modal logic. [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca
Remove repository modal logic (WIP). [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
b92a760a5c
Added dropdown GUI for editing repository. [SCI-1269]
2017-06-02 17:47:28 +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
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
mz3944
689587c4fc
Merge pull request #643 from mz3944/mz-SCI-1305
...
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Matej Zrimšek
e8f842c29f
Forgot to add the updated locales. [fixes SCI-1305]
2017-05-29 11:39:17 +02:00
Zmago Devetak
2224c6511d
Merge pull request #630 from ZmagoD/zd_SCI_1240_v2
...
fix label [fixes SCI-1240]
2017-05-29 09:01:30 +02:00
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
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
98e2a56670
Bump version to 1.8.1
2017-02-23 14:00:46 +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
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
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
Oleksii Kriuchykhin
95953e9269
Fix tutorial step 26 wording [SCI-734]
2017-02-22 14:46:38 +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
Mojca Lorber
0fd41e8a6d
remove changes on user has no teams view
2017-02-21 15:12:58 +01:00
Mojca Lorber
90864a45a0
fix user has no teams view
2017-02-21 13:08:06 +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
Luka Murn
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Oleksii Kriuchykhin
f97c20e9b5
Fix hound warnings [SCI-999]
2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
3eb4faa44b
Fix task restore action
...
Closes SCI-991.
2017-02-10 14:08:56 +01:00
Luka Murn
280b7a0e75
Minor fix
2017-02-09 15:10:45 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +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
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
okriuchykhin
067b9452a4
Merge pull request #464 from okriuchykhin/ok_SCI_935
...
Add config option to enable/disable users registration [SCI-935]
2017-02-01 09:36:36 +01:00
Luka Murn
ec799520d4
Forgot to add en.yml
2017-01-31 16:05:13 +01:00
Luka Murn
50b8588cbf
Version bump to 1.7.2
2017-01-31 15:49:58 +01:00
Luka Murn
db75231617
Update URLs to sciNote support pages
...
Closes SCI-978.
2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin
b35e7e70ba
Enable user registration by default [SCI-935]
2017-01-31 11:10:46 +01:00
Oleksii Kriuchykhin
d1e69438de
Add config option to enable/disable users registration [SCI-935]
2017-01-30 15:04:02 +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
b2d2f56bdd
Version bump to 1.7.1
2017-01-26 17:00:54 +01:00
Luka Murn
042a85af45
Bump version to 1.7.0
2017-01-25 18:22:11 +01:00
Mojca Lorber
d669f006b1
fix tables in reports
2017-01-25 15:15:26 +01:00
zmagod
1220466035
fixing hound
2017-01-25 15:00:14 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
zmagod
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +01:00
Zmago Devetak
7bd368e002
Merge pull request #431 from ZmagoD/zd_add_code_highlight
...
Fixes code highlight and smart annotations experiments bug
2017-01-20 12:59:21 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Oleksii Kriuchykhin
890c5e3c3d
Add “no results found” message in smart annotation [SCI-886]
2017-01-19 13:42:58 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Matej Zrimšek
93a8e0bdae
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
6efcf49927
working version of dropdown filter
2017-01-10 14:14:21 +01:00
zmagod
53d20df449
added xregexp
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
2017-01-10 14:14:21 +01:00
mz3944
ef431da2db
Merge pull request #389 from mz3944/mz-sci-848
...
Unable to delete samples [SCI-848]
2017-01-09 11:57:48 +01:00
okriuchykhin
3c47d17019
Merge pull request #386 from okriuchykhin/ok_SCI_815
...
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
2017-01-09 11:54:28 +01:00
Oleksii Kriuchykhin
aa2b573278
Enable image preview while editing steps and code style improvements [SCI-694]
2017-01-06 15:58:23 +01:00
Matej Zrimšek
5d104981fd
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Luka Murn
3cdd375a2d
Merge pull request #388 from biosistemika/hotfix-1.6.1
...
Hotfix 1.6.1
2017-01-06 11:23:16 +01:00
Oleksii Kriuchykhin
cba064dfcc
Improve error message whan importing CSV files with incorrect character encoding [SCI-815]
2017-01-05 17:00:21 +01:00
Oleksii Kriuchykhin
4fe3030ad4
Freeze WHITELISTED_ATTRIBUTES constatnt [SCI-102]
2017-01-05 16:13:00 +01:00
Oleksii Kriuchykhin
1009347026
Add list of whitelisted attributes [SCI-102]
2017-01-05 15:33:41 +01:00
Luka Murn
ef688feb4e
Hotfix 1.6.1
...
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
2017-01-05 15:27:18 +01:00
Oleksii Kriuchykhin
6487bd788a
Add additional whitelisted tags [SCI-102]
2017-01-05 14:40:38 +01:00
Luka Murn
b614ce714b
Restyle atwho dropdown
2017-01-05 14:06:48 +01:00
Oleksii Kriuchykhin
9c4191a1e0
Initial code commit [SCI-102]
2017-01-05 13:04:19 +01:00
Luka Murn
09ef3b3ad5
Merge pull request #378 from Ducz0r/lm-sci-802-fix
...
Add tooltips to samples column dropdown [SCI-802]
2017-01-04 11:30:04 +01:00
Luka Murn
2c5b27ce81
Change "Update" to "Save"
...
Closes SCI-802.
2017-01-04 11:29:34 +01:00
mlorb
59751ec41e
Merge pull request #373 from mlorb/ml_sci_709
...
Add Protocol Preview to Protocol repository [SCI-709]
2017-01-04 11:28:55 +01:00
Luka Murn
3bee9d2e12
Save an (yet unworking) version of user smart annotations
...
Used so other devs can start working on smart annotations.
2017-01-04 10:54:02 +01:00
Luka Murn
cedc6c5074
Merge pull request #382 from Ducz0r/lm-sci-166-fix
...
Re-add tags index controller action to render tags [SCI-166]
2017-01-04 10:48:09 +01:00
Luka Murn
37cd6417c8
Merge pull request #374 from Ducz0r/lm-sci-808-814-fix
...
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
2017-01-04 09:50:26 +01:00
zmagod
a434649f42
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-01-03 16:35:25 +01:00
Mojca Lorber
c476faca30
fix hound
2017-01-03 11:04:09 +01:00
zmagod
01c086b667
fixes routes.rb indentation
2017-01-03 09:49:18 +01:00
Luka Murn
af9e272b2a
Re-add tags index controller action to render tags
...
Closes SCI-166.
2017-01-03 09:39:41 +01:00
Oleksii Kriuchykhin
d898f8993f
Add description to Clone actions [SCI-766]
2016-12-29 15:33:49 +01:00
Luka Murn
2304742d87
Add tooltips to samples column dropdown
...
Closes SCI-802.
2016-12-27 08:45:23 +01:00
Luka Murn
3922be2b17
Change String in sample types & groups
...
Closes SCI-808.
2016-12-23 11:48:57 +01:00
Luka Murn
e16c826bb1
Version bump to 1.6.0
2016-12-22 11:43:52 +01:00
Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
Oleksii Kriuchykhin
cbef971d85
Fix timeouts when fetching images from S3 [SCI-694]
2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin
b537feb8a0
Added large preview [SCI-694]
2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin
0541253ffa
Added modal for images preview [SCI-694]
2016-12-16 15:53:16 +01:00
Zmago Devetak
90a115fff3
Merge pull request #342 from ZmagoD/zd_SCI_758
...
Generate png preview images for uploaded TIFF images
2016-12-16 15:39:07 +01:00
Zmago Devetak
c8631077df
Merge pull request #361 from biosistemika/improved-sample-table
...
Improved sample table
2016-12-16 15:37:54 +01:00
zmagod
6d2fb3b02c
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790
2016-12-14 17:05:00 +01:00
zmagod
2426539715
fixes long names in columns dropdown [fixes SCI-784]
2016-12-13 14:54:37 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
Zmago Devetak
d54007f69c
Merge pull request #337 from ZmagoD/zd_SCI_740
...
limits max size of all uploaded files at the one time
2016-12-13 09:04:14 +01:00
zmagod
8dd8a7e7cd
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
2016-12-12 15:52:25 +01:00
zmagod
5176f8b459
clean unneeded code [fixes SCI-778] refactor js
2016-12-12 15:40:13 +01:00
zmagod
d9025a9601
changes create/edit mode buttons [fixes SCI-777]
2016-12-12 14:42:06 +01:00
Luka Murn
d30a9780f4
Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
...
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
2016-12-12 09:57:37 +01:00
Luka Murn
1a8b141b95
Add delete custom field functionality
2016-12-09 13:49:19 +01:00
