Commit graph

107 commits

Author SHA1 Message Date
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
Jure Grabnar 15d66c7884 Change validation for experiment workimg 2016-08-10 08:58:29 +02:00
Jure Grabnar 7b0f323576 Add expiring URL to experiment img 2016-08-09 16:37:44 +02:00
zmagod f77e0d4a6e changed workflow image name 2016-08-09 16:27:28 +02:00
zmagod 176aad4c6d fixes multiple graphs rendering 2016-08-09 11:19:07 +02:00
zmagod 1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
Jure Grabnar 964b51f84a Add experiment reports element 2016-08-03 12:52:52 +02:00
zmagod d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
Jure Grabnar 0361f006ca Add SearchableModel to Experiment and fix children 2016-07-26 12:26:48 +02:00
Zmago Devetak b13747291e Merge pull request #32 from ZmagoD/zd_SCI_31
Fixing modules after integrating experiment-level
2016-07-26 09:18:16 +02:00
Luka Murn 3187843d14 Change updated_by -> last_modified_by 2016-07-25 14:47:13 +02:00
zmagod 18d66ece56 migrated model related functions to experiment.rb [fixes: SCI-31] 2016-07-25 11:25:10 +02:00
zmagod 7c9a0bc2bb fixed models 2016-07-22 15:36:48 +02:00
zmagod 389ee7ea43 start fixing modules 2016-07-22 14:31:09 +02:00
Luka Murn 785fb2cba1 Initial migration & changes in ActiveRecords 2016-07-22 10:43:55 +02:00