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
