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

1847 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
3f219e1bfe Hound code style fixes [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
8dc956010c Initial code commit [SCI-443] 2016-10-11 16:43:17 +02:00
Jure Grabnar
1f67aec258 Prevent destroying protocols when file is edited 
SCI-552 #close
 2016-10-06 16:13:42 +02:00
Luka Murn
56d2240de5 Optimize data query in user_notification.rb 2016-10-05 16:21:13 +02:00
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
Zmago Devetak
71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529 
Prepare settings screen for notifications
 2016-10-05 14:54:47 +02:00
zmagod
848beb5d4b minor fix 2016-10-05 09:46:18 +02:00
zmagod
d7a4f85ba1 added links to notification project name and task 2016-10-05 09:40:44 +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
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
Zmago Devetak
91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474 
Unify the comments
 2016-10-03 15:26:17 +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
Jure Grabnar
1e14955ade Prevent deleting asset on step update 2016-10-01 18:47:05 +02:00
Jure Grabnar
d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Jure Grabnar
5c9e995e56 Don't delete asset on locked 2016-10-01 13:23:04 +02:00
Jure Grabnar
a6ebff06a7 Add error message to wopi discovery 
Fix ambigious open call
 2016-09-30 10:39:14 +02:00
Luka Murn
f70829d1a9 Merge pull request #179 from okriuchykhin/ok_SCI-380 
Fixes ordering of checklist items in search results [SCI-380]
 2016-09-30 08:28:07 +02:00
Jure Grabnar
ff47f29dc2 Add wopi file activity 
SCI-393 #close
 2016-09-29 16:16:42 +02:00
zmagod
e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Jure Grabnar
ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +02:00
Jure Grabnar
3bc683be8f Fix access_token_ttl calculation 2016-09-29 10:57:08 +02:00
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
zmagod
485497334d generated notification related migrations and model tests 2016-09-28 14:18:52 +02:00
Jure Grabnar
5aea0fbb19 Refactor the rest of WOPI logic from Nejc 2016-09-28 09:33:44 +02:00
Jure Grabnar
b51f2a3027 Add basic WOPI proof checking 
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
 2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +02:00
Oleksii Kriuchykhin
366a49f3a1 Fixes ordering of checklist items in search results [SCI-380] 2016-09-27 13:00:51 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
zmagod
30a8f52216 generate new experiment img after task restored [fixes SCI-465] 2016-09-26 09:48:49 +02:00
okriuchykhin
a7f3f793c8 Merge pull request #161 from okriuchykhin/ok_SCI-380 
Fixes issue with reordering of checklist items [fixes SCI-380]
 2016-09-23 10:37:56 +02:00
mz3944
cde7f3805f Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2 
Added missing validation for protocol description.
 2016-09-22 17:36:18 +02:00
Oleksii Kriuchykhin
841e495234 Fix brace position [fixes SCI-380] 2016-09-22 16:48:15 +02:00
Matej Zrimšek
09405c667e Added missing validation for protocol description. [SCI-408] 2016-09-22 15:52:12 +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
c614843044 Minor refactoring with hound alert fixes. 2016-09-21 19:48:18 +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
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
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
Oleksii Kriuchykhin
011bb2d910 Fixes issue with reordering of checklist items [fixes SCI-380] 2016-09-21 14:06:47 +02:00
zmagod
42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod
0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +02:00
zmagod
f48553e807 fixed ajax call 2016-09-19 16:12:07 +02:00
Matej Zrimšek
ffe6799313 Fixed hound alerts. 2016-09-16 15:57:54 +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
938aa32190 js tweaks 2016-09-16 15:22:24 +02:00
mz3944
556238f39f Merge pull request #150 from mz3944/mz_local_file_upload_fix 
URL presigning is now used only when using S3 file uploading (caused …
 2016-09-16 09:17:23 +02:00
Zmago Devetak
7c4a62d138 Merge pull request #139 from ZmagoD/zd_SCI_410 
fixed moved experiment thumbnail [fixes SCI-410]
 2016-09-15 11:58:48 +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
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
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
691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
zmagod
1b31f8827d set experiment description to 255 2016-09-08 14:35:52 +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
zmagod
487d3e18f4 fixed moved experiment thumbnail [fixes SCI-410] 2016-09-07 07:55:45 +02:00
zmagod
b672d85405 fixed error message duplication 2016-09-06 11:46:28 +02:00
Matej Zrimšek
9fb30c7661 Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion. 2016-09-06 10:40:01 +02:00
Mojca Lorber
740392c687 optimization 2016-09-05 10:58:37 +02:00
Mojca Lorber
4bce00ac61 fixes hound 2016-09-02 11:54:20 +02:00
Mojca Lorber
83034f705d adds tasks, experiment and project category in protocol search results 2016-09-02 11:45:54 +02:00
Zmago Devetak
5b4eb07960 Merge pull request #118 from ZmagoD/zd_SCI_398 
fixes workflow img bug [fixes SCI-398]
 2016-08-30 14:55:33 +02:00
zmagod
a947354fb5 fixes update times [fixes SCI-398] 2016-08-30 13:23:48 +02:00
Luka Murn
2b382fee0f Merge pull request #113 from Ducz0r/lm-add-first-time-activities 
Fix first time data generator & fake data generator
 2016-08-30 13:07:52 +02:00
Luka Murn
0e0228cb8c Codestyle fixes 2016-08-30 13:06:49 +02:00
zmagod
95ab35e3d6 cleanup update timestamp 2016-08-30 12:58:52 +02:00
Luka Murn
c86d21d689 Fix bug in organization.rb 
Bug was related to introduction of experiment level.
 2016-08-30 09:46:54 +02:00
zmagod
17aacc8ff5 fixes step destroing bug and fixes reports [fixes SCI-247] 2016-08-29 12:04:46 +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
04d9163ff6 Paperclip file spoofing corrected/modified. 2016-08-25 18:57:06 +02:00
Luka Murn
a480c8d403 Styling fixes 2016-08-25 13:59:50 +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
9e3bb8edb7 Add dependant: :destroy to comments 2016-08-25 13:51:30 +02:00
Zmago Devetak
0de7ea31ea Merge pull request #90 from ZmagoD/zd_SCI_376 
fixes cloned experiment protocol [fixes SCI-376]
 2016-08-24 14:12:19 +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
zmagod
2bbb439745 fixes cloned experiment protocol [fixes SCI-376] 2016-08-23 16:15:45 +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
Jure Grabnar
f575303d11 Update get_new_position for new canvas size 
SCI-358 #close
 2016-08-19 13:42:28 +02:00
Zmago Devetak
58930f3456 Merge pull request #73 from ZmagoD/zd_SCI_344 
fixes user duplication [fixes SCI-344]
 2016-08-18 13:28:59 +02:00
zmagod
2216a86db5 hound again 2016-08-18 13:27:46 +02:00
zmagod
d3f61bdd18 fixes hound alert 2016-08-18 13:24:44 +02:00
zmagod
4b5be7530c fixed task archive 2016-08-18 11:53:57 +02:00
zmagod
da2b9ccf82 fixes user duplication [fixes SCI-344] 2016-08-18 11:26:52 +02:00
zmagod
fa08b861d0 fixed experiments archive bug 2016-08-18 10:55:29 +02:00
Zmago Devetak
b6ccecf478 Merge pull request #69 from ZmagoD/zd_SCI_335 
cleans experiment form report if moved [fixes SCI-335]
 2016-08-18 08:37:09 +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
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
854ef0d227 Special characters caused error [fixes SCI-315]. 2016-08-17 18:10:47 +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
zmagod
c27c6c19e5 cleans experiment form report if moved [fixes SCI-335] 2016-08-17 15:21:53 +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
042a33f2c7 Add activity for moving 2016-08-16 08:49:24 +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
6e8e9ecf21 Fix activities and the dreaded no project for modules error 2016-08-11 16:57:29 +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
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
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
5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
Jure Grabnar
e995165876 Double quotes -> single quotes (#hound) 2016-08-09 13:19:32 +02:00
zmagod
176aad4c6d fixes multiple graphs rendering 2016-08-09 11:19:07 +02:00
Jure Grabnar
208e85e7e0 Remove archived experiments from reports 2016-08-09 11:17:25 +02:00
zmagod
1a56396eb5 add workflow image to project overview page [fixes SCI-41] 2016-08-08 16:02:17 +02:00
Jure Grabnar
5a023483d7 Prepare views for experiment archive 2016-08-08 14:19:35 +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
57ac34e9f4 add samples to experiment page [fixes SCI-43] 2016-08-03 12:57:51 +02:00
Jure Grabnar
964b51f84a Add experiment reports element 2016-08-03 12:52:52 +02:00
Luka Murn
ecf5b5a2c1 Feed the Hound 2016-07-29 16:46:25 +02:00
Luka Murn
34af50a9d0 Fix breadcrumbs & sidebar so it works 2016-07-29 15:47:41 +02:00
zmagod
d16c0fe706 fixed edit canvas 2016-07-28 10:09:05 +02:00
Jure Grabnar
1a1c4bb68a Remove needless join from MyModuleGroup 2016-07-27 10:18:57 +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
zmagod
346bffe08f fixed protocol.rb 2016-07-26 09:17:24 +02:00
zmagod
c27ffa9fbf fixed project_my_module method 2016-07-26 08:44:09 +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
b3c61cfa41 fixed project_my_modules method 2016-07-25 09:13:04 +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
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