scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 14:46:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
16460 commits 31 branches 181 tags 167 MiB
Commit graph

230 commits

Author SHA1 Message Date
Anton
63ce422367 Add basic filters for experiment table [SCI-7215] 2022-11-09 15:27:39 +01:00
ajugo
dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Anton
8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Anton
bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton
91c46e2005 Fix copy experiment only to active projects [SCI-7345] 2022-10-17 11:08:59 +02:00
Oleksii Kriuchykhin
f85a6b5a2e Make experiment card dropdown menu async [SCI-7158] 2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin
e27d063b61 Make permission checks for card selection async [SCI-7157] 2022-09-02 18:10:16 +02:00
Oleksii Kriuchykhin
e276054a80 Optimize PE cards loading [SCI-7133] 2022-09-01 11:59:39 +02:00
artoscinote
95a2cc5298
Fix counts for archived tasks [SCI-6881] (#4132) 2022-06-01 11:43:15 +02:00
Oleksii Kriuchykhin
1e9dd95716 Fix duplicated counters on task card [SCI-6825] 2022-05-10 22:23:42 +02:00
Oleksii Kriuchykhin
6fb44eb78e Fix archived tasks view [SCI-6822] 2022-05-10 15:39:59 +02:00
Oleksii Kriuchykhin
e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
aignatov-bio
850b164724
Update error handling for experiment move [SCI-6293] (#3703) 
Co-authored-by: Anton <anton@scinote.net>
 2021-12-01 11:24:01 +01:00
artoscinote
9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
Oleksii Kriuchykhin
2fb71aa312 Add API endpoint for Cloning Experiments [SCI-6088] 2021-10-28 12:28:46 +02:00
aignatov-bio
9e3d64bbb6
Fix projects list in clone experiment dropdowns [SCI-6139] (#3592) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:55:49 +02:00
Martin Artnik
1d20258a2e Fix typo [SCI-5924] 2021-10-01 12:20:51 +02:00
artoscinote
f68d724202
Rework experiment permissions [SCI-6054] (#3538) 
* Rework experiment permissions [SCI-6054]
 2021-09-30 11:32:11 +02:00
Martin Artnik
975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
aignatov-bio
58a5126a13 Fix normalize_module_position method [SCI-5508] 2021-02-19 14:41:57 +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
a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +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
f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +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
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin
48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
mlorb
26bdabb0c3
Merge pull request #2609 from mlorb/ml-sci-4529 
Add rename task and rename experiment activities [SCI-4529]
 2020-06-01 12:58:36 +02:00
aignatov-bio
aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
Mojca Lorber
9b7d321666 Add rename task and rename experiment activities 2020-05-26 15:34:20 +02:00
aignatov-bio
4328634e78 Remove uneditable projects from create task widget 2020-03-09 13:38:38 +01:00
Oleksii Kriuchykhin
16b591b110 Fix sidebar update for inline editing [SCI-4000] 2020-01-06 16:07:23 +01:00
Miha Mencin
e2b5989c14
Revert "Handle missing experiment previews [SCI-3949]" 2019-10-09 16:42:15 +02:00
Oleksii Kriuchykhin
00921a5f6a Hadle missing experiment previews [SCI-3949] 2019-10-09 16:24:21 +02:00
Oleksii Kriuchykhin
9d2ac4179e Fix failing tests [SCI-3908] 2019-10-04 13:02:18 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Oleksii Kriuchykhin
1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Oleksii Kriuchykhin
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
5dccdbab17 fixup! Fix failing tests 2019-03-15 11:12:10 +01:00
Urban Rotnik
976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) 
* Adding inline editing to experiment title, project title and task title
 2019-03-06 09:17:34 +01:00
Urban Rotnik
6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
Urban Rotnik
4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Zanz2
b26530a02f Found a new, and more elegant fix inside controller with Luka 2018-08-28 14:48:23 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
mlorb
600ec99c82 fix project navigation to work with archived pages and correct current team 2018-04-17 13:52:43 +02:00
mlorb
bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
Matej Zrimšek
b8b9707c06 Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring. 2018-02-19 14:51:14 +01:00
Matej Zrimšek
4fe669ca9a Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions. 2018-02-16 10:53:22 +01:00
Matej Zrimšek
0706d16020 Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places. 2018-02-14 14:19:22 +01:00
Matej Zrimšek
d6e7ef465c Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964] 2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6 Grouped permissions for experiment with canaid gem (WIP). 2018-02-14 14:19:00 +01:00
mlorb
e577b363b2 byTheWay fix of Rails 5.1 bug 2017-12-14 14:18:17 +01:00
Oleksii Kriuchykhin
6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Oleksii Kriuchykhin
79efb34191 Fixes error when clonning experiments with long names [SCI-617] 2017-05-12 11:07:11 +02:00
mlorb
54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365 
New experiment redirection [SCI-365]
 2017-04-24 08:55:55 +02:00
Mojca Lorber
cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
zmagod
439cd0cd89 add notification to experiments 2017-04-06 14:55:18 +02:00
zmagod
c2c5616078 rename Organization to Team in controllers 2017-01-24 17:06:51 +01:00
zmagod
21c2f82582 rename controllers where org/organization 2017-01-24 16:57:14 +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
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
Matej Zrimšek
5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Oleksii Kriuchykhin
835e982292 SAnitize AJAX calls in controllers and datatables [SCI-102] 2017-01-05 13:12:22 +01:00
zmagod
e2723a288c fixes bug with samples sorting [fixes SCI-812] 2016-12-21 14:32:28 +01:00
Oleksii Kriuchykhin
e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
zmagod
3117a464f0 fixed controllers 2016-10-17 15:10:26 +02:00
zmagod
bb9c03df24 fixes controllers 2016-10-17 15:10:26 +02:00
zmagod
d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod
8a8bf10f08 clean up flash label 2016-09-21 19:09:57 +02:00
zmagod
bf8e2a208f fixes restore experiment error [fixes SCI-464] 2016-09-21 08:34:32 +02:00
zmagod
b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod
9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod
c526cab498 removed commented code 2016-09-06 11:38:02 +02:00
zmagod
667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +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
f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
Jure Grabnar
3e5e9aed22 Fix 404 on move experiment 
[fixes SCI-378]
 2016-08-24 11:09:03 +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
Zmago Devetak
396325bd67 Merge pull request #86 from ZmagoD/zd_SCI_365 
changed experiment create redirection [fixes SCI-365]
 2016-08-23 16:30:48 +02:00
Mojca Lorber
322be64b5f change experiment path 2016-08-23 14:44:22 +02:00
zmagod
66b8a3055d changed experiment create redirection [fixes SCI-365] 2016-08-23 09:03:39 +02:00
Mojca Lorber
75c52d20e5 fixes hound 2016-08-22 15:30:27 +02:00
Mojca Lorber
131d0d269a fixes edit experiment 2016-08-22 15:18:02 +02:00
zmagod
d38f29d207 set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00
zmagod
cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
zmagod
fa08b861d0 fixed experiments archive bug 2016-08-18 10:55:29 +02:00
zmagod
6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +02:00
Jure Grabnar
a29b56b0bd Even more candy for our dog 2016-08-16 09:15:29 +02:00
Jure Grabnar
042a33f2c7 Add activity for moving 2016-08-16 08:49:24 +02:00
Jure Grabnar
c387439fb2 Fix projects query for experiments 
Remove unneeded word in view
 2016-08-12 11:36:52 +02:00
Jure Grabnar
d7341d0383 Set actions/routes/view for move experiment 2016-08-12 11:26:18 +02:00
Jure Grabnar
9173c83502 Select current project in clone modal 2016-08-11 17:20:06 +02:00
Jure Grabnar
3c36293770 Add activity for cloning experiment 2016-08-11 17:00:33 +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
zmagod
c866e90b33 Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview 2016-08-10 11:33:37 +02:00
zmagod
5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar
0ca5725f9b Archive/restore of experiments now work 2016-08-08 16:35:45 +02:00
zmagod
1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
Jure Grabnar
2bd74866e0 Fix my_modules archive page 2016-08-08 15:04:02 +02:00
Jure Grabnar
deecbf082c Remove badly merged code 2016-08-08 13:06:20 +02:00
zmagod
04d171997e Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41 2016-08-05 15:56:21 +02:00
zmagod
9c5c4f0a3a Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44 2016-08-05 15:23:01 +02:00
zmagod
a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00
zmagod
57ac34e9f4 add samples to experiment page [fixes SCI-43] 2016-08-03 12:57:51 +02:00
zmagod
d11b0b11e9 Feed the Hound 2016-08-03 09:44:05 +02:00
zmagod
caa80642c0 [fixes SCI-304], [fixes SCI-37] 2016-08-03 09:34:10 +02:00
zmagod
f184ee3f2d fixing hound warnings 2016-08-02 09:13:30 +02:00
zmagod
9581e2751f fixes samples page for experiment level [fixes SCI-44] 2016-08-02 08:44:07 +02:00
Luka Murn
4ea86d6aa1 Code style fixes 2016-07-29 10:41:08 +02:00
Luka Murn
ebda92ef05 Add experiments_controller 2016-07-29 10:21:21 +02:00
zmagod
e95f518964 refactor canvas_controller, experiments_controller 2016-07-28 16:01:53 +02:00
zmagod
d91aa5c60b fixed translation sting 'name' to 'experiment' 2016-07-28 14:57:47 +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
9d23cfd940 fixed experiment routes 2016-07-28 11:30:34 +02:00
zmagod
c11932b45b fixed layout 2016-07-28 11:00:56 +02:00
zmagod
54c4051906 added canvas under experiments 2016-07-28 09:01:44 +02:00
zmagod
a17106b883 added experiments controller and fixed sidebar 2016-07-27 16:18:26 +02:00