zmagod
|
a68e7abc57
|
first run notification settings
|
2016-10-04 15:52:48 +02:00 |
|
Jure Grabnar
|
0c7cd52dba
|
Add WOPI icons/buttons to files
|
2016-10-04 12:34:43 +02:00 |
|
Luka Murn
|
61cb9651c7
|
Merge pull request #188 from biosistemika/global-notifications
Global notifications
|
2016-10-04 08:30:50 +02:00 |
|
Jure Grabnar
|
03567d6208
|
Prevent archive of locked result asset
|
2016-10-03 17:07:57 +02:00 |
|
mlorb
|
153b692c0c
|
Merge pull request #181 from mlorb/ml_sci_321
Displaying more information for individual samples in Sample table [SCI-321]
|
2016-10-03 16:37:35 +02:00 |
|
Mojca Lorber
|
3b0185a45b
|
change title of modal
|
2016-10-03 16:33:58 +02:00 |
|
Jure Grabnar
|
f727289935
|
Add lock check for editing result
|
2016-10-03 13:43:35 +02:00 |
|
zmagod
|
ea17182372
|
generate notifications [fixes SCI-440]
|
2016-10-03 11:37:29 +02:00 |
|
Mojca Lorber
|
5b32be2137
|
adding subtitle in modal
|
2016-10-03 09:28:58 +02:00 |
|
Jure Grabnar
|
d9fa882d6a
|
Add check for locked files on step delete
|
2016-10-01 14:51:55 +02:00 |
|
Luka Murn
|
49c5474219
|
Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2
Fixed wrong CSS formatting and added release notes link to help link.
|
2016-09-30 08:27:57 +02:00 |
|
Jure Grabnar
|
ff47f29dc2
|
Add wopi file activity
SCI-393 #close
|
2016-09-29 16:16:42 +02:00 |
|
Matej Zrimšek
|
a6324d61c5
|
Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.
|
2016-09-29 14:27:26 +02:00 |
|
zmagod
|
cab1e9b521
|
start implement toolbar view
|
2016-09-28 16:03:52 +02:00 |
|
Mojca Lorber
|
efa7a1d7b5
|
add sample information in pop-up
|
2016-09-28 15:46:41 +02:00 |
|
zmagod
|
2a86aaf7e4
|
changed popout content [fixes SCI-520]
|
2016-09-28 15:12:30 +02:00 |
|
Mojca Lorber
|
cc5cdf2577
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321
|
2016-09-26 09:39:05 +02:00 |
|
Mojca Lorber
|
c2b742374f
|
adding popup sample info
|
2016-09-23 17:45:02 +02:00 |
|
Matej Zrimšek
|
fc86b7b1fd
|
Added help dropdown. [SCI-13]
|
2016-09-23 12:52:38 +02:00 |
|
Matej Zrimšek
|
234918a76d
|
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
|
2016-09-21 19:48:18 +02:00 |
|
Matej Zrimšek
|
c2f0106993
|
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
|
2016-09-16 15:56:44 +02:00 |
|
Zmago Devetak
|
b26bf7b183
|
Merge pull request #136 from ZmagoD/zd_SCI_370
Enabled to delete results in task archive [fixes SCI-370]
|
2016-09-13 15:22:08 +02:00 |
|
zmagod
|
691ae94d2c
|
enabled to delete results in task archive [fixes SCI-370]
|
2016-09-13 13:26:04 +02:00 |
|
zmagod
|
d482dff2e6
|
adds label to current project in clone experiment modal [fixes SCI-341]
|
2016-09-07 08:26:36 +02:00 |
|
Zmago Devetak
|
9440371f3f
|
Merge pull request #131 from ZmagoD/zd_SCI_400
Sets front end validation for experiment move action [fixes SCI-400]
|
2016-09-06 11:39:38 +02:00 |
|
zmagod
|
667fb67052
|
sets front end validation for experiment move action [fixes SCI-400]
|
2016-09-02 16:31:17 +02:00 |
|
Matej Zrimšek
|
828eebeb16
|
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
|
2016-08-31 17:21:17 +02:00 |
|
mlorb
|
905acfd43d
|
Merge pull request #109 from mlorb/ml_sci_286
fixes notification when adding new sample [SCI-286]
|
2016-08-30 17:54:45 +02:00 |
|
Zmago Devetak
|
6878adda46
|
Merge pull request #112 from ZmagoD/zd_SCI_338_vol2
Tutorial
|
2016-08-30 11:07:51 +02:00 |
|
zmagod
|
e02478b1f9
|
fixed tutorial labels
|
2016-08-30 09:35:57 +02:00 |
|
zmagod
|
5518d1cd1e
|
fixed 16 step of tutorial
|
2016-08-30 08:52:44 +02:00 |
|
Mojca Lorber
|
53cdbc2638
|
fixes notification when adding new sample
|
2016-08-29 13:45:54 +02:00 |
|
zmagod
|
2ac20d1af1
|
adds new image + new panel title [fixes SCI-336]
|
2016-08-29 09:28:29 +02:00 |
|
zmagod
|
d886d05ccb
|
Merge branch 'zd_SCI_338'
|
2016-08-26 16:32:49 +02:00 |
|
Matej Zrimšek
|
e3a7f45fdf
|
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
|
2016-08-26 11:13:40 +02:00 |
|
Zmago Devetak
|
0cfc758f43
|
Merge pull request #102 from ZmagoD/zd_SCI_336
implement first time popup logic
|
2016-08-26 09:19:36 +02:00 |
|
zmagod
|
2031c42920
|
fixed confirmation text
|
2016-08-26 09:13:45 +02:00 |
|
zmagod
|
1738ca66d2
|
one-time introductory popup [fixes SCI-336]
|
2016-08-25 18:44:21 +02:00 |
|
Luka Murn
|
8018cff02e
|
Merge pull request #103 from Ducz0r/bb_edit_delete_comments
Edit&delete comments
|
2016-08-25 17:18:48 +02:00 |
|
zmagod
|
cd6780775c
|
removed a sentence from canvas_overview_html
|
2016-08-25 15:35:37 +02:00 |
|
Zmago Devetak
|
b090fd8d5b
|
Merge pull request #95 from ZmagoD/zd_SCI_374
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-25 14:07:33 +02:00 |
|
Luka Murn
|
b0d7b9dc75
|
Generate activities when editing/deleting comments
|
2016-08-25 13:51:31 +02:00 |
|
Luka Murn
|
15c0baeee8
|
Add delete project comment functionality
This commit also removes the old code from @bberic.
|
2016-08-25 13:51:30 +02:00 |
|
zmagod
|
5fabe06b8d
|
implement first time popup logic
|
2016-08-25 11:44:49 +02:00 |
|
mlorb
|
c38a4e2614
|
Merge pull request #94 from mlorb/ml_sci_375
add move experiment instructions [SCI-375]
|
2016-08-25 09:45:16 +02:00 |
|
mlorb
|
0a066f436f
|
Merge pull request #96 from mlorb/ml_sci_369
buttons update on experiment overview [SCI-369]
|
2016-08-25 08:54:16 +02:00 |
|
zmagod
|
dbdbff12eb
|
add experiment level tutorial step [fixes SCI-338]
|
2016-08-24 19:03:58 +02:00 |
|
Mojca Lorber
|
408af14e41
|
replace description in add content to report window
|
2016-08-24 17:19:29 +02:00 |
|
Mojca Lorber
|
2a897432e1
|
update buttons on canvas view
|
2016-08-24 17:00:27 +02:00 |
|
zmagod
|
9393a96302
|
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-24 14:10:50 +02:00 |
|
Jure Grabnar
|
00da7efb44
|
Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
Conflicts:
app/models/experiment.rb
SCI-328 #close
|
2016-08-24 13:11:10 +02:00 |
|
Mojca Lorber
|
f554dc6018
|
add move experiment instructions
|
2016-08-24 11:36:50 +02:00 |
|
mlorb
|
5c8d669cac
|
Merge pull request #81 from mlorb/ml_sci_364
fixes edit experiment [SCI-364]
|
2016-08-23 16:49:20 +02:00 |
|
Jure Grabnar
|
0d56cea3e4
|
Add placeholders for empty experiments
|
2016-08-23 10:37:48 +02:00 |
|
zmagod
|
03a3759cf5
|
fixes project overview style and add no description link [fixes SCI-360]
|
2016-08-23 08:52:53 +02:00 |
|
Mojca Lorber
|
131d0d269a
|
fixes edit experiment
|
2016-08-22 15:18:02 +02:00 |
|
Jure Grabnar
|
5bb99adb25
|
Add frontend logic for moving workflows from canvas
|
2016-08-19 17:11:17 +02:00 |
|
Mojca Lorber
|
fb081be682
|
fixes warning messages when loading a new protocol that is linked with repository
|
2016-08-19 16:03:10 +02:00 |
|
Matej Zrimšek
|
c87ba5b45c
|
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
|
2016-08-17 18:10:32 +02:00 |
|
Matej Zrimšek
|
951cf67b3d
|
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
|
2016-08-17 18:08:21 +02:00 |
|
Matej Zrimšek
|
86880f0299
|
Additional changes, refactoring and improvements.
|
2016-08-17 17:57:54 +02:00 |
|
Matej Zrimšek
|
e2f94caa96
|
Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.
|
2016-08-17 17:54:06 +02:00 |
|
Jure Grabnar
|
0cdea0b51a
|
Add modal for moving task on canvas
|
2016-08-17 15:46:30 +02:00 |
|
Zmago Devetak
|
da735a51f4
|
Merge pull request #62 from ZmagoD/zd_SCI_318
Zd sci 318
|
2016-08-17 10:01:10 +02:00 |
|
zmagod
|
7abc8f3a90
|
Merge branch 'master' into experiment-level
|
2016-08-17 09:28:35 +02:00 |
|
Jure Grabnar
|
275106c27c
|
Add check for empty projects on move experiments
|
2016-08-16 10:20:36 +02:00 |
|
zmagod
|
5e647f62d5
|
changed import label [fixes SCI-317]
|
2016-08-16 09:34:04 +02:00 |
|
Jure Grabnar
|
042a33f2c7
|
Add activity for moving
|
2016-08-16 08:49:24 +02:00 |
|
zmagod
|
852fe499fb
|
clean up linked protocol
|
2016-08-12 16:31:40 +02:00 |
|
Jure Grabnar
|
d7341d0383
|
Set actions/routes/view for move experiment
|
2016-08-12 11:26:18 +02:00 |
|
Jure Grabnar
|
2f6ccac3bc
|
Add unique experiment name and copy image when cloning
|
2016-08-11 16:58:31 +02:00 |
|
Jure Grabnar
|
3b259d34b0
|
Basic cloning of experiment works
Still missing:
- cloning of assets
- cloning of experiment image
|
2016-08-11 15:13:36 +02:00 |
|
Jure Grabnar
|
7f21ae138a
|
Set clone actions/routes/view
DRY code for showing AJAX on project#show page
|
2016-08-11 09:46:15 +02:00 |
|
Jure Grabnar
|
1a7a7a1d1a
|
Add info to experiment archive cards
Also add addtional check for due date on archive experiment
|
2016-08-09 11:04:46 +02:00 |
|
Jure Grabnar
|
2bd74866e0
|
Fix my_modules archive page
|
2016-08-08 15:04:02 +02:00 |
|
Jure Grabnar
|
5a023483d7
|
Prepare views for experiment archive
|
2016-08-08 14:19:35 +02:00 |
|
jbargu
|
3f91e7a476
|
Merge pull request #47 from biosistemika/jg_explvl_reports
Update reports with experiment level
[Fixes SCI-35].
|
2016-08-08 08:51:23 +02:00 |
|
zmagod
|
a4ec558596
|
start to implement project overview page
|
2016-08-04 12:57:33 +02:00 |
|
Jure Grabnar
|
acc41dae40
|
Add experiment content report dialog
Adding still has to be implemented
|
2016-08-03 12:52:51 +02:00 |
|
Jure Grabnar
|
d82ba163ed
|
Add experiment to report screen
Only placeholder for now, JS still needs fixing.
|
2016-08-03 12:52:06 +02:00 |
|
zmagod
|
caa80642c0
|
[fixes SCI-304], [fixes SCI-37]
|
2016-08-03 09:34:10 +02:00 |
|
zmagod
|
25b99b6570
|
fixed search [fixes SCI-261]
|
2016-07-29 16:32:54 +02:00 |
|
Luka Murn
|
8a2b54819a
|
More fixes on secondary navigation
|
2016-07-29 16:20:35 +02:00 |
|
Luka Murn
|
b64e200b91
|
Refactor canvas a lot.
Also refactor localization files concerning canvas.
|
2016-07-28 16:41:10 +02:00 |
|
zmagod
|
23a46d5fb3
|
added translations to experiment create and edit flash messages
|
2016-07-28 14:52:11 +02:00 |
|
zmagod
|
352944fc33
|
added new/edit experiment modals
|
2016-07-28 14:44:44 +02:00 |
|
zmagod
|
54c4051906
|
added canvas under experiments
|
2016-07-28 09:01:44 +02:00 |
|
Zmago Devetak
|
c869db2506
|
Merge pull request #35 from ZmagoD/zd_SCI_40
Edit canvas controller to work with experiments
|
2016-07-27 12:11:19 +02:00 |
|
zmagod
|
5c7501a273
|
added experiments canvas labels in localization file and fixed canvas views
|
2016-07-26 14:21:59 +02:00 |
|
Jure Grabnar
|
80621c9b6b
|
Add experiment text to all searches related to experiment
|
2016-07-26 12:26:48 +02:00 |
|
Jure Grabnar
|
3be562bdf6
|
Add experiment to search results
|
2016-07-26 12:26:48 +02:00 |
|
Luka Murn
|
076b67620f
|
Migration GitLab -> GitHub
|
2016-07-21 13:11:15 +02:00 |
|
Luka Murn
|
055298fee8
|
Initial commit.
|
2016-02-12 16:52:43 +01:00 |
|