Luka Murn
3bee9d2e12
Save an (yet unworking) version of user smart annotations
...
Used so other devs can start working on smart annotations.
2017-01-04 10:54:02 +01:00
zmagod
a434649f42
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-01-03 16:35:25 +01:00
Zmago Devetak
c8631077df
Merge pull request #361 from biosistemika/improved-sample-table
...
Improved sample table
2016-12-16 15:37:54 +01:00
zmagod
6d2fb3b02c
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790
2016-12-14 17:05:00 +01:00
zmagod
1ff98bb6df
adds tooltip to samples dropdown and column names
2016-12-14 13:36:10 +01:00
zmagod
9037ab3f48
fixed navigation link
2016-12-14 10:35:48 +01:00
zmagod
8dd8a7e7cd
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
2016-12-12 15:52:25 +01:00
zmagod
8bb452e4f7
trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]
2016-12-12 10:30:03 +01:00
zmagod
de3099e4d1
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
2016-12-09 13:59:49 +01:00
Luka Murn
da630ac2cb
Make edit, delete buttons clickable & hide them if neccesary
2016-12-09 13:18:59 +01:00
zmagod
83aae59eed
adds sample groups index page
2016-12-02 09:33:09 +01:00
Luka Murn
76ec77fce4
Merge pull request #329 from biosistemika/simplify-signup
...
Merge simplify-signup into master
2016-11-30 09:41:20 +01:00
Luka Murn
6491cf1806
Refactor & fix sign up constraints
2016-11-29 16:53:40 +01:00
Luka Murn
b1b095910c
Merge pull request #309 from Ducz0r/lm-remove-unused-files
...
Brace for impact...
2016-11-25 10:00:29 +01:00
Zmago Devetak
341fb13a26
Merge pull request #310 from ZmagoD/zd_add_email_login_constraints
...
adds rake task that creates a sign up email domain constraint
2016-11-23 09:16:24 +01:00
zmagod
d75d58b159
moved email constraint to database_helper
2016-11-23 09:13:09 +01:00
Mojca Lorber
48ac289b6e
put recaptcha in helper method
2016-11-22 17:57:42 +01:00
Luka Murn
595b213b1a
Changes up to samples in views folder
2016-11-19 16:51:40 +01:00
Luka Murn
f5795f5516
Remove unused assets & helpers
2016-11-18 11:30:03 +01:00
Luka Murn
08c6210f7c
Also employ "no format" Nokogiri strategy when sanitizing
...
Closes SCI-691.
2016-11-17 16:43:14 +01:00
Luka Murn
26d04b1f3c
Merge branch 'rich-text-formatting' into 'master'
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
Luka Murn
a3bbf94643
Add a smart_text_area tag & implement it throughout application
...
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
2016-11-16 17:57:01 +01:00
Mojca Lorber
6f1c9ffb81
refactoring
2016-11-08 11:20:14 +01:00
Mojca Lorber
63eb4eeaf8
fix hound
2016-11-07 15:33:21 +01:00
Mojca Lorber
27c83992b4
refactoring notification method
2016-11-07 15:31:06 +01:00
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
Jure Grabnar
0c7cd52dba
Add WOPI icons/buttons to files
2016-10-04 12:34:43 +02:00
Jure Grabnar
03567d6208
Prevent archive of locked result asset
2016-10-03 17:07:57 +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
