Martin Artnik
|
975a8910a8
|
Updated project permission helpers [SCI-6041]
|
2021-09-07 11:27:52 +02:00 |
|
Martin Artnik
|
7e6ca3be8a
|
Merge branch 'develop' into features/new_permissions
|
2021-09-06 10:33:32 +02:00 |
|
Martin Artnik
|
ca6dfa2541
|
Display dropdown item info border using CSS [SCI-6013]
|
2021-09-02 12:58:25 +02:00 |
|
Martin Artnik
|
35e815449d
|
Experiment dropdown layout fixes [SCI-6013]
|
2021-09-02 12:42:06 +02:00 |
|
artoscinote
|
21d780e4ca
|
Merge pull request #3446 from artoscinote/ma_SCI_5893
Fix style of experiment id in dropdown [SCI-5893]
|
2021-07-29 11:44:52 +02:00 |
|
aignatov-bio
|
7b0ea6f701
|
Show experiment id for users with read only permission [SCI-5895] (#3434)
|
2021-07-21 21:33:00 +02:00 |
|
Martin Artnik
|
c4b106f2b8
|
Fix style of experiment id in dropdown [SCI-5893]
|
2021-07-19 12:53:15 +02:00 |
|
zmagoD
|
277da3abcf
|
fix merge issues
|
2021-07-10 15:20:55 +02:00 |
|
Oleksii Kriuchykhin
|
d1208bad0b
|
Merge branch 'develop' into features/new_permissions
|
2021-07-07 13:44:36 +02:00 |
|
zmagoD
|
ad10befcc4
|
add new manage access permission to PET levels
|
2021-06-19 17:17:57 +02:00 |
|
Martin Artnik
|
0866a2e251
|
Added experiment ID to card and table views [SCI-5828]
|
2021-06-18 14:12:59 +02:00 |
|
zmagoD
|
9f3195aa76
|
hide experiment actions dropdown when the user can't manage the experiment (SCI-5790)
|
2021-06-12 11:15:44 +02:00 |
|
zmagoD
|
de4c28069a
|
fix experiment level styling issues and update the dropdown placeholerds
|
2021-05-16 11:04:04 +02:00 |
|
zmagoD
|
5ee38966a0
|
Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui
|
2021-05-11 08:36:39 +02:00 |
|
zmagoD
|
d145dd6d36
|
add my module assigments modals
|
2021-05-09 16:59:10 +02:00 |
|
zmagoD
|
ac91d9c2c4
|
add assign user permission to experiment level
|
2021-05-08 18:06:07 +02:00 |
|
zmagoD
|
331a68e9b6
|
fix new experiment creation
|
2021-05-08 10:05:22 +02:00 |
|
aignatov-bio
|
9281a5631c
|
Remove project from experiments page breadcrumbs [SCI-5564]
|
2021-03-25 14:32:05 +01:00 |
|
Urban Rotnik
|
919eeb2783
|
Fix titles to one line
SCI-5518
|
2021-03-08 22:04:19 +01:00 |
|
Urban Rotnik
|
e1db291729
|
Merge pull request #3200 from urbanrotnik/ur-sci-5525
Add breadcrumbs on Experiments and Tasks pages [SCI-5525]
|
2021-03-08 14:13:44 +01:00 |
|
Urban Rotnik
|
235f19cf25
|
Store Table/Cards view setting per user
SCI-5450
|
2021-03-04 14:56:59 +01:00 |
|
Urban Rotnik
|
401224ae11
|
Add breadcrumbs on Experiments and Tasks pages
|
2021-03-04 09:00:58 +01:00 |
|
Urban Rotnik
|
3bca05fc94
|
Prevent showing empty files for experiments without Tasks
SCI-5481
|
2021-02-18 12:03:28 +01:00 |
|
Urban Rotnik
|
6ea39c9363
|
Add experiment thumbnail, update archived view for experiments
SCI-5481
|
2021-02-18 12:03:13 +01:00 |
|
aignatov-bio
|
0368579799
|
Update experiment card css [SCI-5469]
|
2021-02-16 12:42:09 +01:00 |
|
mlorb
|
78a76ea3a1
|
Merge pull request #3154 from mlorb/ml-sci-5470
Add no results page on experiments page [SCI-5470]
|
2021-02-15 10:26:26 +01:00 |
|
Urban Rotnik
|
1ae0b42c2c
|
Fix Dots and Checkbox visibility on experiment cards
|
2021-02-12 13:25:12 +01:00 |
|
Mojca Lorber
|
b600f22248
|
Add no results page on experiment page
|
2021-02-12 12:12:26 +01:00 |
|
Urban Rotnik
|
b831d5fa14
|
Fix duplicate button permissions
|
2021-02-12 07:12:26 +01:00 |
|
Urban Rotnik
|
4cd2bce83f
|
Fix Move button on Experiment card
|
2021-02-11 18:38:23 +01:00 |
|
aignatov-bio
|
1a3c715d72
|
Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button
Add action to more button [SCI-5468]
|
2021-02-11 13:56:54 +01:00 |
|
aignatov-bio
|
f6422a50ac
|
Add action to more button
|
2021-02-11 12:41:22 +01:00 |
|
Mojca Lorber
|
ce451f86a8
|
Fix projects breadcrumbs style [SCI-5349]
|
2021-02-10 23:33:16 +01:00 |
|
aignatov-bio
|
2fad6f5f8e
|
Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes
Fix archived project routes and experiment archived date [SCI-5477]
|
2021-02-10 18:38:13 +01:00 |
|
aignatov-bio
|
8adbd11197
|
Fix archived project routes and experiment archived date [SCI-5477]
|
2021-02-10 15:05:53 +01:00 |
|
aignatov-bio
|
486dae7559
|
Add task counter to experiment card [SCI-5467]
|
2021-02-10 14:50:42 +01:00 |
|
aignatov-bio
|
9d3d1f8eac
|
Connect toolbar actions to buttons [SCI-5465]
|
2021-02-09 15:47:15 +01:00 |
|
aignatov-bio
|
a843aac769
|
Add list view for experiments [SCI-5365]
|
2021-02-04 16:45:31 +01:00 |
|
Oleksii Kriuchykhin
|
c62c464902
|
Implement editing options and modals for experiment card [SCI-5367]
|
2021-02-04 12:06:51 +01:00 |
|
aignatov-bio
|
b4a6644f13
|
Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen
Connect front-end with back-end for experiments page [SCI-5457]
|
2021-02-04 11:00:17 +01:00 |
|
Mojca Lorber
|
d897e20426
|
Implement new experiment card layout
|
2021-02-04 09:02:23 +01:00 |
|
aignatov-bio
|
a7a948abaf
|
Add archive/restore toolbar buttons and backend [SCI-5457]
|
2021-02-03 14:29:50 +01:00 |
|
aignatov-bio
|
7726eae4da
|
Add experiments page load logic and connect filters [SCI-5457]
|
2021-02-03 14:29:50 +01:00 |
|
aignatov-bio
|
29cf9be1f6
|
Add filters to experiments pages [SCI-5366] (#3119)
* Move filters to shared folder [SCI-5366]
|
2021-01-29 13:24:02 +01:00 |
|
Mojca Lorber
|
1080c22b30
|
Update Experiments page layout and the toolbar row
|
2021-01-28 22:47:08 +01:00 |
|
aignatov-bio
|
8396c086f5
|
Add sticky toolbar for projects page [SCI-5401] (#3108)
* Add sticky toolbar for projects page [SCI-5401]
|
2021-01-25 15:36:23 +01:00 |
|
aignatov-bio
|
6011bb36b6
|
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
|
2021-01-15 15:08:27 +01:00 |
|
Urban Rotnik
|
1070e813fc
|
Add helper for archived_on date
|
2021-01-12 15:35:35 +01:00 |
|
aignatov-bio
|
8533e54adb
|
Add permission check for open manage user modal and experiment actions dropdown [SCI-5382] (#3073)
|
2021-01-12 12:16:33 +01:00 |
|
aignatov-bio
|
276d6abe19
|
Update archive navigation for tasks page [SCI-5347] (#3052)
* Update archive navigation for tasks page [SCI-5347]
|
2021-01-07 17:18:52 +01:00 |
|
Oleksii Kriuchykhin
|
ffd9132b52
|
Make active projects view default [SCI-5340]
|
2020-12-31 16:00:26 +01:00 |
|
Oleksii Kriuchykhin
|
67b3f853d7
|
Merge branch 'develop' into features/folders
|
2020-12-18 14:51:21 +01:00 |
|
aignatov-bio
|
2ca7b81cea
|
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011)
* Change experiment archived card [SCI-5270]
|
2020-12-17 13:07:30 +01:00 |
|
Oleksii Kriuchykhin
|
94b6c96e48
|
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
|
2020-12-12 22:46:30 +01:00 |
|
Oleksii Kriuchykhin
|
9546b8f71d
|
Prepare backend for the improved navigation [SCI-5177]
|
2020-12-03 10:19:11 +01:00 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
8fa024ed10
|
Remove all tooltips from HTML
|
2020-04-28 12:30:43 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
Oleksii Kriuchykhin
|
3fd687161f
|
Remove unused variables from activities controller [SCI-2778]
|
2018-11-14 13:17:38 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Oleksii Kriuchykhin
|
e89d60785f
|
Fix dates on activities and experiments [SCI-2778]
|
2018-11-12 10:26:48 +01:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Zanz2
|
2d1d4c78bc
|
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
|
2018-08-21 11:27:01 +02:00 |
|
Zanz2
|
8c492e1491
|
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
|
2018-08-17 16:03:49 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
zmagod
|
43a60b632a
|
adds datahook to experiment card [fixes SCI-2373]
|
2018-06-06 17:28:04 +02:00 |
|
Oleksii Kriuchykhin
|
f656ad1561
|
Fix fa icons [SCI-2217]
|
2018-03-30 17:03:44 +02:00 |
|
Matej Zrimšek
|
854333b0e6
|
Grouped permissions for experiment with canaid gem (WIP).
|
2018-02-14 14:19:00 +01:00 |
|
Oleksii Kriuchykhin
|
917c2cf28e
|
Fix experiment workflow image update indicator [SCI-1872]
|
2017-12-22 13:12:52 +01:00 |
|
Matej Zrimšek
|
a5cffd06f3
|
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
|
2017-04-25 16:03:50 +02:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +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
|
1b2fa78e42
|
adds user preview to user smart annotation [fixes SCI-832]
|
2017-01-13 11:34:10 +01:00 |
|
Oleksii Kriuchykhin
|
d05c16b0ba
|
Added auto_link wrapper with custom sanitization [SCI-102]
|
2017-01-11 17:02:17 +01:00 |
|
zmagod
|
89e8946a47
|
expand smart annotation
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
fafecce264
|
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
|
2016-11-23 14:18:50 +01:00 |
|
Matej Zrimšek
|
a6a2a237aa
|
Removed unneeded ERB tags, which caused error. Minor refactoring.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
ece89da391
|
Removed ruby constants duplicates in JS, because of caching problems.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
0780bd2416
|
Ruby constants are now automatically available in JS. Refactoring was needed.
|
2016-10-17 11:57:37 +02:00 |
|
Matej Zrimšek
|
a3dfb59558
|
Added remaining constants.
|
2016-10-17 11:30:05 +02:00 |
|
okriuchykhin
|
b5c861583d
|
Merge pull request #157 from okriuchykhin/ok_SCI_430
Fixes issue with unneeded sort icon [fixes SCI-430]
|
2016-09-22 16:39:26 +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 |
|
Oleksii Kriuchykhin
|
411ee4ee77
|
Fixes issue with unneeded sort icon [fixes SCI-430]
|
2016-09-20 11:30:11 +02:00 |
|
zmagod
|
eb39eedfdf
|
[fixes SCI-398] again
|
2016-08-31 08:46:51 +02:00 |
|
zmagod
|
d886d05ccb
|
Merge branch 'zd_SCI_338'
|
2016-08-26 16:32:49 +02:00 |
|
zmagod
|
8ff645fb89
|
disabled experiment dropdown actions
|
2016-08-25 15:16:51 +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 |
|
zmagod
|
dbdbff12eb
|
add experiment level tutorial step [fixes SCI-338]
|
2016-08-24 19:03:58 +02:00 |
|
zmagod
|
9393a96302
|
adds edit workflow link if no workflow [fixes SCI-374]
|
2016-08-24 14:10:50 +02:00 |
|
Zmago Devetak
|
afaeab492d
|
Merge pull request #87 from ZmagoD/zd_SCI_371
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
|
2016-08-24 11:56:29 +02:00 |
|
zmagod
|
27d77bc73f
|
added new permission for dropdown actions
|
2016-08-24 10:56:30 +02:00 |
|
Zmago Devetak
|
9dc7708b73
|
Merge pull request #85 from ZmagoD/zd_SCI_360
fixes project overview style and add no description link [fixes SCI-360]
|
2016-08-23 16:24:22 +02:00 |
|
Zmago Devetak
|
aa650bbc65
|
Merge pull request #82 from ZmagoD/zd_SCI_359
Add plus button at the bottom of project overview page [fixes SCI-359]
|
2016-08-23 16:23:20 +02:00 |
|
zmagod
|
0429816154
|
deleted commented code
|
2016-08-23 16:21:11 +02:00 |
|
zmagod
|
f918746946
|
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
|
2016-08-23 09:26:52 +02:00 |
|
zmagod
|
03a3759cf5
|
fixes project overview style and add no description link [fixes SCI-360]
|
2016-08-23 08:52:53 +02:00 |
|