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
efe031d766
setup current_organization in all controllers
2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311
setup global team switch view and controller action
2016-10-17 15:10:26 +02: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
ece89da391
Removed ruby constants duplicates in JS, because of caching problems.
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
Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +02:00
Luka Murn
bdaeb4db13
Add notification mailer preview
2016-10-13 08:56:04 +02:00
mlorb
78f7879c04
Merge pull request #216 from mlorb/ml_sci_555
...
Adding update notifications in settings [SCI-555]
2016-10-13 08:53:55 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Luka Murn
cccabcdd7b
Remove invitation_to_organization email
...
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
2016-10-12 10:54:36 +02:00
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
c783e9a03d
Code fix after rebase with latest master [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
868ffd03d6
JS code improvement [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
246dae4f46
Code style improvements according to hound [SCI-442]
2016-10-05 15:51:11 +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
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
