scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
13340 commits 31 branches 181 tags 166 MiB
Commit graph

164 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
e456661a98 Fix task archiving and moving [SCI-5030] 2020-09-17 17:15:41 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin
94588e4698 Refactor task archive and move permissions [SCI-4817] 2020-07-24 17:00:42 +02:00
Urban Rotnik
15342cd8f2 Fix update_canvas 2020-06-15 10:52:35 +02:00
aignatov-bio
aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
aignatov-bio
4c33abff05 Assign user after task created 2020-03-30 15:16:14 +02:00
Miha Mencin
8e98c82bbf SCI-3979 removing accessors 2019-10-09 15:49:49 +02:00
Miha Mencin
f12c29bd2a fixing import 2019-10-08 21:40:44 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +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
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Jure Grabnar
83130426e2
Merge pull request #1617 from jbargu/jg_3244 
Duplicated activity, report activity ... [SCI-3244]
 2019-04-01 14:31:53 +02:00
Jure Grabnar
6533368763 Add activity for importing inv items 2019-03-29 15:41:34 +01:00
Jure Grabnar
f843092aac Add activity for moving worklfows 
Closes SCI-3252
 2019-03-29 13:51:17 +01:00
Alex Kriuchykhin
9137740266
Merge pull request #1607 from okriuchykhin/ok_SCI_3229 
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
 2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin
d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +01:00
mlorb
5f663b3c74
Merge pull request #1600 from mlorb/ml-sci-3215 
Implement missing tests for global activities [SCI-3215][SCI-3219]
 2019-03-28 11:10:38 +01:00
Oleksii Kriuchykhin
37c559debd Fix experiment workflow image display after touching [SCI-3177] 2019-03-27 17:02:59 +01:00
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Mojca Lorber
c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Urban Rotnik
2ea2700837 fixup! Fix failing tests 2019-03-15 10:30:51 +01:00
Urban Rotnik
3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Oleksii Kriuchykhin
74a60d443d Merge branch 'features/global-activities' into ok_SCI_3014_v2 2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin
61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Urban Rotnik
5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik
7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
Mojca Lorber
0e14c126e5 Add scope instead of method for active my_module_group 2019-02-14 10:53:48 +01:00
Urban Rotnik
6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
Oleksii Kriuchykhin
cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik
4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin
bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Urban Rotnik
f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik
47cc6a9d10 Refactor workflow_image_generation and move to service class 2019-01-18 16:56:33 +01:00
Urban Rotnik
1b70f42817 Refactor 'Experiment.modules_without_group' to Module's scope 2019-01-18 16:54:00 +01:00
Oleksii Kriuchykhin
311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Alex Kriuchykhin
51ba74cbab
Merge pull request #1403 from okriuchykhin/ok_SCI_2757 
Enable caching for navigation sidebar [SCI-2757]
 2018-12-10 14:11:05 +01:00
Oleksii Kriuchykhin
e43b366cdb Disable fragment caching 2018-11-29 18:07:31 +01:00
Oleksii Kriuchykhin
60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
Oleksii Kriuchykhin
2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
Oleksii Kriuchykhin
66869fe4cf Fix canvas update [SCI-1871] 2017-12-20 11:44:11 +01:00
Luka Murn
8254153bb9 Merge branch 'master' into rails-5.1 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/connection.rb
	app/models/experiment.rb
	app/models/my_module.rb
 2017-10-23 08:57:57 +02:00
Oleksii Kriuchykhin
9a8e33c6d7 Small fixes [SCI-1642] 2017-10-11 17:24:31 +02:00
Oleksii Kriuchykhin
6820511ea0 Further canvas optimizations [SCI-1642] 2017-10-06 12:43:27 +02:00
Oleksii Kriuchykhin
b26b963e54 Optimize update canvas SQL and remove module group name [SCI-1642] 2017-10-05 16:19:25 +02:00
zmagod
311270ff49 refactor 2017-07-03 15:32:02 +02:00
zmagod
bef5a085c4 Fixes bugs on canvas [fixes SCI-1408] 2017-06-29 10:29:41 +02:00
zmagod
525c9770ac fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
zmagod
819f47b450 setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
Oleksii Kriuchykhin
79efb34191 Fixes error when clonning experiments with long names [SCI-617] 2017-05-12 11:07:11 +02:00
Oleksii Kriuchykhin
0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
Oleksii Kriuchykhin
07d658ab82 Improve speed of search [SCI-1157] 2017-04-11 14:55:44 +02:00
Luka Murn
043613782e Minor change 2017-03-02 13:04:13 +01:00
zmagod
a193850ae6 rename models where org/organization 2017-01-24 16:34:21 +01:00
zmagod
9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
mz3944
b5e38afb64 Merge pull request #416 from mz3944/mz-sci-884 
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
 2017-01-18 16:13:19 +01:00
Oleksii Kriuchykhin
55d0e82fcd Change If statement to ternary operator [SCI-887] 2017-01-18 13:43:21 +01:00
Matej Zrimšek
3085452ec9 Fixed some hound alerts. [SCI-884] 2017-01-17 11:04:16 +01:00
Oleksii Kriuchykhin
50edaef4ff Do not show archived projects, experiments and tasks in smart annotations [SCI-887] 2017-01-16 16:55:10 +01:00
Matej Zrimšek
15d7944302 Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889] 2017-01-13 18:51:05 +01:00
zmagod
1840fdb7e5 cleanup js 2017-01-12 09:52:29 +01:00
zmagod
3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
zmagod
6efcf49927 working version of dropdown filter 2017-01-10 14:14:21 +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
5966911b92 Fixed Hound alerts. 2016-10-17 11:57:46 +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
Oleksii Kriuchykhin
0dd1196ae5 Fixes issue with move of experiments between projects [fixes SCI-400] 2016-09-22 15:10:15 +02:00
Matej Zrimšek
c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +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
zmagod
779b713148 refactor code 2016-09-15 11:55:02 +02:00
zmagod
d146970f6b add generate workflow image method for moved modules 2016-09-15 09:32:29 +02:00
zmagod
d5c5c55bf2 refactor 2016-09-13 16:32:33 +02:00
zmagod
29a2904513 fixed moving action of workflows and tasks 2016-09-13 14:51:53 +02:00
zmagod
487d3e18f4 fixed moved experiment thumbnail [fixes SCI-410] 2016-09-07 07:55:45 +02:00
zmagod
a947354fb5 fixes update times [fixes SCI-398] 2016-08-30 13:23:48 +02:00
zmagod
95ab35e3d6 cleanup update timestamp 2016-08-30 12:58:52 +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
Jure Grabnar
dff5abf3d9 Fix module moving position not being updated 2016-08-24 11:42:21 +02:00
Jure Grabnar
67768c8865 Fix Hound errors 2016-08-23 11:08:10 +02:00
Jure Grabnar
358f2b1c47 Add moving for newly created modules 2016-08-23 10:00:34 +02:00
Jure Grabnar
c0edf51054 Fix bounding box algorithm, can move new modules 2016-08-23 09:00:25 +02:00
Jure Grabnar
8940ba891b Add initial position for moving workflows 2016-08-22 17:52:55 +02:00
zmagod
cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
Jure Grabnar
80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +02:00
Zmago Devetak
f2e08db106 Merge pull request #67 from ZmagoD/zd_SCI_337 
Zd sci 337
 2016-08-18 08:06:38 +02:00
zmagod
6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +02:00
zmagod
d557f3249f Adds single tasks to the experiment img [fixes SCI-329] 2016-08-17 11:13:49 +02:00
Zmago Devetak
762b805651 Merge pull request #55 from ZmagoD/zd_papperclip_migration_bug 
fixes migration error
 2016-08-16 10:44:53 +02:00
Jure Grabnar
a29b56b0bd Even more candy for our dog 2016-08-16 09:15:29 +02:00
Jure Grabnar
b25a7758db Give a candy to our special dog 2016-08-16 09:10:45 +02:00
Jure Grabnar
e55c66b3d0 Add query for moveable projects 2016-08-16 08:47:04 +02:00
Jure Grabnar
555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +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
zmagod
060da59bbb fixes migration error 2016-08-11 09:19:12 +02:00
Jure Grabnar
b2855d69f6 Fix hound warning 2016-08-10 09:24:06 +02:00