zmagod
a116feac9c
fixed typos and added truncation to org name
2016-10-17 15:21:19 +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
Matej Zrimšek
a6a2a237aa
Removed unneeded ERB tags, which caused error. Minor refactoring.
2016-10-17 11:57:47 +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
Luka Murn
02d3e03f75
Bugfix for notification emails
...
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
2016-10-13 12:12:28 +02:00
Oleksii Kriuchykhin
8dc956010c
Initial code commit [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
a39c948c5f
System notifications code rework
2016-10-03 15:21:26 +02:00
Oleksii Kriuchykhin
f5cc2fe225
Code style fixes
2016-09-30 09:34:58 +02:00
Oleksii Kriuchykhin
036bda3afa
Initial code for system notifications [SCI-444]
2016-09-29 16:51:27 +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
Zmago Devetak
b26bf7b183
Merge pull request #136 from ZmagoD/zd_SCI_370
...
Enabled to delete results in task archive [fixes SCI-370]
2016-09-13 15:22:08 +02:00
zmagod
691ae94d2c
enabled to delete results in task archive [fixes SCI-370]
2016-09-13 13:26:04 +02:00
zmagod
faed0500c7
set move and clone permissions to also validate the user on the organizational level [fixes SCI-372]
2016-09-08 09:23:29 +02:00
Luka Murn
a0311970f8
Add missing commits for showing image and not able to preview
2016-08-26 16:49:32 +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
Luka Murn
8018cff02e
Merge pull request #103 from Ducz0r/bb_edit_delete_comments
...
Edit&delete comments
2016-08-25 17:18:48 +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
8a73a3ab5c
Update permission_helper.rb and routes.rb
2016-08-25 13:51:30 +02:00
Luka Murn
319bcc7850
Add permissions for comments to permission_helper.rb
2016-08-25 13:51:30 +02:00
zmagod
1120ef1407
adds experiment and team to tag search resuls [fixes SCI-381]
2016-08-25 10:40:03 +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
Zmago Devetak
afaeab492d
Merge pull request #87 from ZmagoD/zd_SCI_371
...
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
2016-08-24 11:56:29 +02:00
zmagod
27d77bc73f
added new permission for dropdown actions
2016-08-24 10:56:30 +02:00
Jure Grabnar
a091571d9c
Add consistent links for archive for all entities
2016-08-24 09:14:29 +02:00
Jure Grabnar
0cdb18ffcd
Update experiment links on sidebar between actions
2016-08-24 09:05:57 +02:00
zmagod
eab05eb9db
adds font-awesome to pdf [fixes SCI-345]
2016-08-22 14:40:09 +02:00
Jure Grabnar
6879521a75
Add missing .experiment to can_unlink_protocol
2016-08-18 10:48:44 +02:00
Matej Zrimšek
4ad384df5a
Fixed hound alerts.
2016-08-17 21:02:05 +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
0cdea0b51a
Add modal for moving task on canvas
2016-08-17 15:46:30 +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
a0fe31479f
Fix permissions for archived experiments
2016-08-09 10:00:44 +02:00
Jure Grabnar
0ca5725f9b
Archive/restore of experiments now work
2016-08-08 16:35:45 +02:00
Jure Grabnar
2bd74866e0
Fix my_modules archive page
2016-08-08 15:04:02 +02:00
Jure Grabnar
5a023483d7
Prepare views for experiment archive
2016-08-08 14:19:35 +02:00
Jure Grabnar
775a39344c
Fix experiment archive permissions
2016-08-08 13:40:08 +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
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
0c51f7bc8b
Saving/editing of reports now works
2016-08-03 13:15:40 +02:00
zmagod
caa80642c0
[fixes SCI-304], [fixes SCI-37]
2016-08-03 09:34:10 +02:00
zmagod
9581e2751f
fixes samples page for experiment level [fixes SCI-44]
2016-08-02 08:44:07 +02:00
Luka Murn
40fe4e54a9
Feed the Hound #2
2016-07-29 16:48:56 +02:00
Luka Murn
ecf5b5a2c1
Feed the Hound
2016-07-29 16:46:25 +02:00
Luka Murn
8a2b54819a
More fixes on secondary navigation
2016-07-29 16:20:35 +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
