scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1375 commits 70 branches 179 tags 165 MiB
Commit graph

312 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin 8b5b0723d1 Initial code commit 2016-10-05 15:51:11 +02:00
zmagod 9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn 61cb9651c7 Merge pull request #188 from biosistemika/global-notifications 
Global notifications
 2016-10-04 08:30:50 +02:00
zmagod c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +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
zmagod 0d23f05698 Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440 2016-10-03 16:14:22 +02:00
zmagod 947096862d fixed hound 2016-10-03 11:40:59 +02:00
zmagod ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
zmagod 2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
zmagod cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
zmagod dad0d3868b fixing hound 2016-09-27 17:31:37 +02:00
zmagod 2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
Mojca Lorber c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Matej Zrimšek 13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +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
Zmago Devetak 5fedcb4be2 Merge pull request #160 from ZmagoD/zd_SCI_464 
Fixes restore experiment error [fixes SCI-464]
 2016-09-21 19:24:33 +02:00
zmagod 06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +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 42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod da86208441 styled step comments 2016-09-20 14:13:40 +02:00
zmagod 0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +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 431227c0a4 Merge pull request #147 from maslick/resultCommentsError1000Chars 
Fixed: Comments in results have no error message if the text exceeds 1000 characters
 2016-09-16 09:38:38 +02:00
Matej Zrimšek 76ff34a8a9 URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring. 2016-09-13 18:56:47 +02:00
zmagod 7c363d5ade fixed security issue 2016-09-13 13:57:31 +02:00
zmagod 3d5a42cc27 refactor results controller 2016-09-13 13:26:04 +02:00
zmagod 222ddf7438 fixed houd error 2016-09-13 13:26:04 +02:00
zmagod 691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
Pavel Maslov 15ea8fc0dc Bug fixed: comments in results have no error message if the text exceeds 1000 characters. 2016-09-13 12:01:56 +02:00
Zmago Devetak 1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
Matej Zrimšek b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +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
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 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
zmagod 4afaa50ce0 fixed multiple tables check 2016-09-01 13:49:12 +02:00
zmagod 111cb81d08 clear tables from report [fixes SCI-247] again 2016-09-01 13:38:09 +02:00
Mojca Lorber a35bf7182f fixes troubles 2016-08-30 09:43:39 +02:00
Mojca Lorber b07f1af90f fixes hound again again 2016-08-29 17:08:00 +02:00
Mojca Lorber 7f8bb9be53 fixes hound again 2016-08-29 13:59:51 +02:00
Mojca Lorber 60b0d69a72 fixes hound 2016-08-29 13:56:05 +02:00
Mojca Lorber 53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +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
Matej Zrimšek 782d384e26 Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
Matej Zrimšek 04d9163ff6 Paperclip file spoofing corrected/modified. 2016-08-25 18:57:06 +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
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 a480c8d403 Styling fixes 2016-08-25 13:59:50 +02:00
Luka Murn 8592c13ed4 Remove now obsolote controller actions 2016-08-25 13:51:31 +02:00
Luka Murn b0d7b9dc75 Generate activities when editing/deleting comments 2016-08-25 13:51:31 +02:00
Luka Murn 24dd25d9f5 Add edit/delete result comment functionality 
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
 2016-08-25 13:51:31 +02:00
Luka Murn bac0455435 Add edit&delete functionality to step comments 
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
 2016-08-25 13:51:31 +02:00
Luka Murn 512efd3812 Fix 2 lines that were too long 2016-08-25 13:51:31 +02:00
Luka Murn c92d016f65 Add edit&delete module/task comments functionality 
This required a minor fix of comments.js.
 2016-08-25 13:51:31 +02:00
Luka Murn f0d9cb96fa Add edit project comments functionality 2016-08-25 13:51:30 +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
scibb a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +02:00
zmagod f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
jbargu 5c104ac050 Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error 
Fix 404 move experiment error
 2016-08-24 16:35:29 +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 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
Zmago Devetak 65049692ea Merge pull request #78 from ZmagoD/zd_SCI_349 
updating thumbnail
 2016-08-23 16:22:07 +02:00
Mojca Lorber 322be64b5f change experiment path 2016-08-23 14:44:22 +02:00
Jure Grabnar 67768c8865 Fix Hound errors 2016-08-23 11:08:10 +02:00
zmagod 66b8a3055d changed experiment create redirection [fixes SCI-365] 2016-08-23 09:03:39 +02:00
Jure Grabnar c0edf51054 Fix bounding box algorithm, can move new modules 2016-08-23 09:00:25 +02:00
Jure Grabnar 667b7671a6 Add connections for moved workflows 2016-08-22 17:26:21 +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
mlorb 0832466d20 Merge pull request #76 from mlorb/ml_sci_286 
fixes notifications when creating new sample type or group [SCI-286]
 2016-08-22 08:54:28 +02:00
Mojca Lorber 1c220aba7b delete comment 2016-08-22 08:50:48 +02:00
zmagod cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
Zmago Devetak 99aa66cd84 Merge pull request #74 from ZmagoD/zd_SCI_346 
check search input string [fixes SCI-346]
 2016-08-19 14:01:56 +02:00
Mojca Lorber 799cac1238 fixes hound 2016-08-19 13:55:34 +02:00
Jure Grabnar 80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +02:00
Mojca Lorber 5695842fe3 fixes notifications when creating sample types and groups 2016-08-18 16:05:15 +02:00
zmagod d62500cb56 check search input string [fixes SCI-346] 2016-08-18 13:14:31 +02:00
zmagod fa08b861d0 fixed experiments archive bug 2016-08-18 10:55:29 +02:00
Matej Zrimšek 4ad384df5a Fixed hound alerts. 2016-08-17 21:02:05 +02:00
Matej Zrimšek 27a9dac412 File permissions corrected, with some refactoring. 2016-08-17 18:23:24 +02:00
Matej Zrimšek e4a6a3944e Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
Matej Zrimšek ccdccc5cf1 Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
Matej Zrimšek 854ef0d227 Special characters caused error [fixes SCI-315]. 2016-08-17 18:10:47 +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
Jure Grabnar 78cf4f396e render_403 and 404 now return true 
To prevent any: render_403 and return type of bugs
 2016-08-17 15:46:30 +02:00
Jure Grabnar 0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +02:00
zmagod 6c5cc8aac9 fixes notification [fixes SCI-337] 2016-08-17 13:17:40 +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 850f5d8dad fixing hound alerts 2016-08-17 09:44:23 +02:00
zmagod 7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +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
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +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
Jure Grabnar 1ca34a7986 Fix result texts/tables 2016-08-10 15:44:33 +02:00
Jure Grabnar 52e6d7d300 Fix step comments 2016-08-10 15:44:33 +02:00
Jure Grabnar 3e72f29bfd Fix uploading of step assets 2016-08-10 15:44:33 +02:00
Jure Grabnar d69195a4f6 Fix uploading of result assets 2016-08-10 15:44:33 +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
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 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
Jure Grabnar d9702b6964 Remove unneeded new element 2016-08-05 08:36:06 +02:00
Jure Grabnar 2f0dc57ea6 Fix Hounds warning 2016-08-05 08:29:49 +02:00
Jure Grabnar cafec6a1b4 Fix controls on experiment contents 
Also fix bug with adjencent elements not updating controls.

Fixes SCI-35.
 2016-08-04 16:05:03 +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
Jure Grabnar aedaf2f30a Adding of experiment content now works in reports 2016-08-03 12:52:52 +02:00
Jure Grabnar 5854e72878 Add experiments_contents action 2016-08-03 12:52:52 +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 1e334d9075 Remove unneeded "Add new report element" 2016-08-03 12:52:06 +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 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 18d73467c8 fixed hound warning 2016-08-02 11:16:07 +02:00
zmagod 166f907780 fixed search error 2016-08-02 11:10:30 +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 ecf5b5a2c1 Feed the Hound 2016-07-29 16:46:25 +02:00
zmagod 95da62adde fixed hound 2016-07-29 16:38:42 +02:00
zmagod 25b99b6570 fixed search [fixes SCI-261] 2016-07-29 16:32:54 +02:00
Luka Murn b085aa1db3 Remove uneccesary project_activities HTML pages 2016-07-29 16:06:35 +02:00
Luka Murn 34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
Luka Murn 4ea86d6aa1 Code style fixes 2016-07-29 10:41:08 +02:00
Luka Murn edafcaeed6 Move route module_archive_project -> module_archive_experiment 
Also add some new routes, move some templates.
 2016-07-29 10:25:02 +02:00
Luka Murn ebda92ef05 Add experiments_controller 2016-07-29 10:21:21 +02:00
Luka Murn b64e200b91 Refactor canvas a lot. 
Also refactor localization files concerning canvas.
 2016-07-28 16:41:10 +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 d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +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
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 485d93f8b9 refactor canvas permissions 2016-07-27 11:35:07 +02:00
zmagod 5c7501a273 added experiments canvas labels in localization file and fixed canvas views 2016-07-26 14:21:59 +02:00
zmagod 0a84ecdfc1 edit canvas controller to work with experiment 2016-07-26 14:02:06 +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