Miha Mencin
5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426
...
Changes to create new office file button [SCI-3426]
2019-05-13 10:55:58 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] ( #1753 )
...
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
aignatov-bio
364f903b3c
Fix protocol preview name ( #1749 )
2019-05-13 10:17:47 +02:00
aignatov-bio
0b194eb3b1
Revert "Fix report saving ( #1748 )" ( #1752 )
...
This reverts commit 3db6129808
.
2019-05-13 09:09:36 +02:00
aignatov-bio
3db6129808
Fix report saving ( #1748 )
2019-05-13 08:58:47 +02:00
Luka Murn
b78caef915
Fix the file preview modal so it supports WOPI_ENABLED == false
2019-05-10 16:41:11 +02:00
Anton Ignatov
f80d881847
Fix markup
2019-04-28 19:11:41 +02:00
Anton Ignatov
2847ec7609
Add env variable and check for MarvinJS available
2019-04-28 17:08:18 +02:00
Anton Ignatov
46f0e0c0c2
Add marvin js assets to assets sort and name field
2019-04-27 12:46:45 +02:00
Urban Rotnik
c41413234c
Use MS office icons for MS files
2019-04-26 09:29:39 +02:00
Urban Rotnik
11a7a975af
Merge branch 'features/scinote-improvements' into master-with-note-section
2019-04-23 14:50:03 +02:00
Urban Rotnik
b1dabaca15
New helper for file thumbnails
2019-04-23 13:50:48 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
mlorb
1e3d0e901a
Merge pull request #1667 from mlorb/ml-sci-3304
...
Fix links in activity message for protocols in repository [SCI-3304]
2019-04-15 11:55:08 +02:00
Anton Ignatov
dd8b3caf65
Fix duplicate activtiy issue and fix link to inventory
2019-04-15 11:35:30 +02:00
Mojca Lorber
252fdaf9a8
Fix links in activity message for protocols in repository
2019-04-12 15:14:41 +02:00
Urban Rotnik
ee3dc571e1
Update attachments view, add ordering on FE
2019-04-09 14:17:40 +02:00
Anton Ignatov
811f07a62c
Update API endpoints for new activities
2019-04-08 15:07:45 +02:00
Jure Grabnar
b12916b828
Add main functionality
2019-04-04 17:05:25 +02:00
Oleksii Kriuchykhin
d6bd703ec8
Fix activity genereation with discarded inventories [SCI-3290]
2019-04-03 21:18:48 +02:00
Oleksii Kriuchykhin
8c2b2513b0
Fix user popup in global activities [SCI-3285]
2019-04-03 12:53:52 +02:00
Urban Rotnik
86ddbc68b6
fixup! Show date actual value without link
2019-04-02 14:21:06 +02:00
Urban Rotnik
8eaeeee9f8
Show date actual value without link
2019-04-02 13:15:34 +02:00
Urban Rotnik
73dd6678ee
Fix for show date value
2019-04-02 10:36:11 +02:00
Urban Rotnik
dc0c629798
Fix to show report name in Activities
2019-04-01 15:58:28 +02:00
Urban Rotnik
0ed96d68de
Add step position for steps in Protocol repository. Add default value for blank names also.
2019-04-01 15:58:17 +02:00
Alex Kriuchykhin
b3aa6be23d
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
...
Add global activities to reports [SCI-3255]
2019-04-01 15:07:06 +02:00
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163
...
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
2019-04-01 14:32:54 +02:00
Oleksii Kriuchykhin
98e58ff7eb
Add global activities to reports [SCI-3255]
2019-04-01 11:26:51 +02:00
Urban Rotnik
03dcc91cf1
Fix showing result icon when result is deleted
2019-04-01 09:58:13 +02:00
Oleksii Kriuchykhin
5008339d81
Add handling of links for objects from another team [SCI-3229][SCI-3241]
2019-03-28 14:56:34 +01:00
Oleksii Kriuchykhin
d7d45bec70
Fix links for archived objects in global activities [SCI-3229]
2019-03-28 13:43:50 +01:00
Miha Mencin
8e12e0f5b3
[SCI-3236] showing font-awesome icon based on result type
2019-03-26 17:04:31 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities
2019-03-25 14:35:24 +01:00
Anton Ignatov
bc58f0aecd
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
2019-03-21 11:48:51 +01:00
Anton Ignatov
07c2819163
refactoring tinymce image uploading
2019-03-20 14:46:54 +01:00
Jure Grabnar
5de51f9c58
Prevent smart annotations accessing other teams when importing protocol
...
Closes SCI-3163
2019-03-20 12:58:22 +01:00
Mojca Lorber
4f9814b884
Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021
2019-03-20 11:03:00 +01:00
Oleksii Kriuchykhin
b46f3566ef
Fix rendering of HTML in RTE fields [SCI-3111]
2019-03-19 23:32:24 +01:00
Mojca Lorber
d1e38e5bc9
Project activities refactoring
2019-03-19 15:33:57 +01:00
Urban Rotnik
fe35c805b7
Add model breadcrumbs, update activities_helper
2019-03-19 14:01:06 +01:00
Oleksii Kriuchykhin
a822227383
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
ded74044de
Fix circle icon in image editor [SCI-2855]
2019-03-11 15:10:38 +01:00
Oleksii Kriuchykhin
0930277c4e
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
2019-02-27 16:02:53 +01:00
mz3944
f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903
...
Fix (unite) Date and Time display formats [SCI-2903]
2019-01-21 09:50:34 +01:00
Matej Zrimšek
838455af0d
Fix protocols.io Date handling at import
2019-01-12 19:28:45 +01:00
Alex Kriuchykhin
be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931
...
Fix image URLs in export all document [SCI-2931]
2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin
ec28db6f4f
Fix image URLs in export all document [SCI-2931]
2019-01-10 14:19:40 +01:00
Oleksii Kriuchykhin
2769add4d9
Disable edit button for unsupported WOPI formats [SCI-2904]
2018-12-31 18:10:12 +01:00
Matej Zrimšek
b74105abc2
Fix Date and Time display formats
2018-12-23 20:30:09 +01:00
Alex Kriuchykhin
ab0924c8e6
Merge pull request #1415 from okriuchykhin/ok_SCI_2864
...
Use built-in methods for Postgres extensions enabling [SCI-2864]
2018-12-16 19:45:56 +01:00
Oleksii Kriuchykhin
7cd1c12a4f
Use built-in methods for Postgres extensions enabling [SCI-2864]
2018-12-10 14:14:49 +01:00
Oleksii Kriuchykhin
60a19734b2
Enable caching for navigation sidebar [SCI-2757]
2018-11-29 11:28:36 +01:00
Alex Kriuchykhin
20e2cbf0ca
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
...
Fix smart annotations rendering issues [SCI-2880]
2018-11-28 09:47:20 +01:00
Oleksii Kriuchykhin
d67abfda2c
Additional fixies for smart annotations [SCI-2880]
2018-11-26 15:17:18 +01:00
Jure Grabnar
6ec2c99a28
Hound styling
2018-11-26 13:52:01 +01:00
Jure Grabnar
0086e4dcf3
Catch some of templates error when import protocols.io
2018-11-26 13:43:05 +01:00
Jure Grabnar
c7d108ec16
Update according to Hound
...
Closes [SCI-2790]
2018-11-23 20:52:07 +01:00
Jure Grabnar
2834edb286
Add command/subprotocol/safety for PIO
2018-11-23 20:13:34 +01:00
Jure Grabnar
c00b08b101
Add sw_package and dataset component for PIO
2018-11-23 19:44:10 +01:00
Jure Grabnar
5ab2556632
Importing of protocols now works
2018-11-23 18:54:37 +01:00
Jure Grabnar
2c8a7f8eca
Add last_modified evaluation for PIO import
2018-11-23 17:51:47 +01:00
Jure Grabnar
87d5e5029a
Fix publish_date in PIO import
2018-11-23 17:37:26 +01:00
Jure Grabnar
76c2da4bae
Add uniq tables
2018-11-23 16:30:29 +01:00
Oleksii Kriuchykhin
537de596a7
Merge latest master [SCI-2778]
2018-11-14 13:05:57 +01:00
Luka Murn
84df2c81f9
Merge branch 'features/export-all'
...
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
81d751974d
Fix helpers to use with export all [SCI-2793]
2018-10-22 14:32:10 +02:00
Matej Zrimšek
46da1e6b7d
Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641]
2018-10-15 07:13:41 +02:00
Matej Zrimšek
9fb5520970
Refactor/match exported filenames in export all PDF [SCI-2641]
2018-10-15 05:54:19 +02:00
Matej Zrimšek
17380ba0ca
Refactoring rebased code [SCI-2641]
2018-10-15 01:12:25 +02:00
Matej Zrimšek
67d51a8880
Refactor ReportsHelper#render_report_element
2018-10-12 07:40:22 +02:00
Matej Zrimšek
aa30cf6130
Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641]
2018-10-12 07:40:22 +02:00
Matej Zrimšek
1575da6edb
Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641]
2018-10-12 07:40:22 +02:00
Matej Zrimšek
d970576d60
Switch between generating report PDF and export all PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
c0dc4f6951
Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
ed6dfc90b0
Also shorten too long folder names, fix filename shortening [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
7152d2f0f1
Fix/update file naming convection for exported files [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
6f77c4772c
Minor fix for assets & tables naming in export all PDF
2018-10-12 07:40:21 +02:00
Matej Zrimšek
0ebce8e283
Add relative links (not working) to files and tables into the PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Zanz2
b26530a02f
Found a new, and more elegant fix inside controller with Luka
2018-08-28 14:48:23 +02:00
Oleksii Kriuchykhin
6669beaf0e
Change icons throughout the rest of application [SCI-2445]
2018-07-27 15:27:08 +02:00
Zmago Devetak
5a1615825d
removes unneeded comment
2018-07-11 09:29:10 +02:00
zmagod
8fe1977ca8
adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334]
2018-07-10 15:34:07 +02:00
Oleksii Kriuchykhin
c0232d9eb2
Add extend for task child elements in reports [SCI-2377]
2018-06-19 14:34:36 +02:00
mlorb
0a8bfdb860
Reposition the arrow for opening/closing of Navigation
2018-06-01 13:18:49 +02:00
Luka Murn
b3ae1d8fa6
Remove some dead code, make sidebar toggle animated
2018-05-27 16:24:47 +02:00
mlorb
c4ecfc4d38
Change icons throughout sciNote - navigation, project, task cards
2018-05-22 16:55:58 +02:00
mlorb
81392362ac
Final button colour changes
2018-05-18 16:24:24 +02:00
zmagod
b125863baf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71
fixes typos, fixes pdf rendering
2018-05-17 11:21:34 +02:00
zmagod
87369ae16b
fixes ajax error in repositories [fixes SCI-2399]
2018-05-16 15:08:50 +02:00
mlorb
7df40e56c7
UI/UX restyle - fixes throughout application part one
2018-05-08 16:33:42 +02:00
Zmago Devetak
a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344
...
adds new string truncation method [fixes SCI-2344]
2018-05-07 16:30:12 +02:00
zmagod
0b721d86b1
adds new string truncation method [fixes SCI-2344]
2018-05-03 14:24:23 +02:00
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244
2018-04-26 14:07:03 +02:00
Luka Murn
cb6fe50832
Merge branch 'master' into ux-release-1
...
Conflicts:
app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
mlorb
9e11f3b220
update buttons positions and wording throughout app
2018-04-25 13:57:12 +02:00
Luka Murn
caab0cf55c
Update the ordering upon table load
2018-04-20 12:31:22 +02:00
mlorb
d7eccac289
Merge pull request #1099 from mlorb/ml-sci-2167
...
Remove breadcrumbs throughout application [SCI-2167]
2018-04-19 16:11:37 +02:00
mlorb
c149b3cc2a
refactoring
2018-04-19 15:12:26 +02:00
Zmago Devetak
540dff25e7
Merge pull request #1091 from ZmagoD/zd_SCI_2254
...
adds correct preview images to files [fixes SCI-2254]
2018-04-19 14:04:24 +02:00
zmagod
0adc06b1a1
adds edit repository item permission to normal user [fixes SCI-2297]
2018-04-13 13:11:29 +02:00
zmagod
9812a9f160
adds correct preview images to files [fixes SCI-2254]
2018-04-13 09:43:14 +02:00
zmagod
b4deb232c0
rename variable: not_in_repository => display_image_tag
2018-04-12 13:40:17 +02:00
zmagod
233e73c709
adds asset preview link to repository row modal and to table row item [fixes SCI-2110]
2018-04-10 17:06:53 +02:00
Zmago Devetak
eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076
...
add asset field preview/sort/search in repository table [fixes SCI-2076]
2018-04-09 14:29:45 +02:00
zmagod
b51ad84ee5
add asset field preview/sort/search in repository table [fixes SCI-2076]
2018-04-06 12:03:39 +02:00
Zmago Devetak
71531ebf12
refactor
2018-04-05 16:46:09 +02:00
zmagod
c0cc6c293a
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
2018-04-05 13:15:32 +02:00
zmagod
a8a19df06d
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-05 08:51:58 +02:00
okriuchykhin
e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217
...
Refactor file preview modal [SCI-2217]
2018-04-05 00:18:43 +02:00
zmagod
525a1c15ca
fixes hound
2018-04-04 16:40:07 +02:00
zmagod
0c05c60ebf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-04 16:06:38 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206
...
add ID column to repository [fixes SCI-2206]
2018-04-04 15:39:59 +02:00
Oleksii Kriuchykhin
3b7977ee3b
Merge latest changes from ux-release-1 [SCI-2217]
2018-04-04 14:20:34 +02:00
zmagod
e630d3113f
add ID column to repository [fixes SCI-2206]
2018-04-04 11:55:11 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
zmagod
56b0900619
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-03-29 16:42:10 +02:00
zmagod
659a088058
refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]
2018-03-29 15:55:26 +02:00
zmagod
baf69461f5
adds edit/create modal and related actions
2018-03-23 16:00:33 +01:00
mlorb
9aa87a17e5
remove help helper
2018-03-23 14:26:53 +01:00
mlorb
35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118
...
Code left-side menu bar [SCI-2118]
2018-03-20 14:40:55 +01:00
mlorb
e0926ddc3c
code refactoring
2018-03-20 13:53:11 +01:00
zmagod
1cdba5e0d3
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
2018-03-16 11:05:16 +01:00
mlorb
9de998e85c
code left-side menu bar
2018-03-14 14:33:34 +01:00
Zanz2
bf34d82791
refactored to PR
2018-03-13 17:42:26 +01:00
Zanz2
97c01c386b
pushing fix
2018-03-10 22:48:25 +01:00
zmagod
0baa7a1f99
fix hound
2018-03-09 14:43:12 +01:00
zmagod
26883af386
fix assigned ordering
2018-03-08 17:36:10 +01:00
Oleksii Kriuchykhin
156a639e4c
Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]
2018-03-06 17:36:40 +01:00
zmagod
fb66131e29
setup endpoint for repository_rows paging/search
2018-03-06 16:32:39 +01:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011
...
Wrapping up the permissions [SCI-2011]
2018-03-06 07:10:40 +01:00
Zanz2
8f5dd3df38
Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818
...
Table missing scrollbar [SCI-1818]
2018-03-05 17:13:06 +01:00
Zanz2
1e6f1acef5
fixed according to pr
2018-03-05 17:02:37 +01:00
Zanz2
451d14c2e9
Added 4 to constants too, then fixed line too long error
2018-03-05 16:48:18 +01:00
Zanz2
c5728c4018
Merge branch 'master' into null_step_crash_sci2043
2018-03-05 16:37:24 +01:00
Zanz2
e3e7514049
removed redundant return
2018-03-05 16:15:33 +01:00
Zanz2
554b31e0aa
Added constants
2018-03-05 16:09:06 +01:00
Zanz2
ba67446eee
quick fix for if previous guid is unknown format
2018-03-03 22:26:00 +01:00
Zanz2
5bcda7f6de
fixed pr
2018-03-02 23:02:35 +01:00
Zanz2
350f12bdbc
using dig method now
2018-03-02 22:29:51 +01:00
Luka Murn
070450f813
Merge branch 'release-1.12.11'
...
Conflicts:
config/initializers/extends.rb
2018-03-01 14:04:57 +01:00
Oleksii Kriuchykhin
aa933ad1f4
Add extendable file types mappings for icons [PIP-46]
2018-02-26 14:23:02 +01:00
Zanz2
29aea1ebd2
refactored according to PR
2018-02-21 16:17:53 +01:00
Zanz2
9c2a2956e3
Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818
...
Merging Biosis master with branch that resizes small tables to atleast 5x5
2018-02-19 17:40:13 +01:00
Matej Zrimšek
b8b9707c06
Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.
2018-02-19 14:51:14 +01:00
Zanz2
673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834
...
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
2018-02-16 12:52:51 +01:00
Matej Zrimšek
5bda53eebf
Overall refactoring of all canaid permissions and code related to their calls.
2018-02-16 10:54:06 +01:00
Matej Zrimšek
4fe669ca9a
Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.
2018-02-16 10:53:22 +01:00
Zanz2
fab9180b7b
fixed small oversight
2018-02-15 23:40:09 +01:00
Zanz2
c963c948a1
Fixed main issue, bad step structure now gets fixed to empty template
2018-02-15 23:28:20 +01:00
Zanz2
95501eb046
saving work for later
2018-02-15 20:01:36 +01:00
Matej Zrimšek
6b1fee4d30
Added/joined repository record assignment to task with sample assignmment to task.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
8ef6c8f91f
Refactored remaining experiment level permissions (and everything below it).
2018-02-14 14:39:07 +01:00
Matej Zrimšek
d6e7ef465c
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6
Grouped permissions for experiment with canaid gem (WIP).
2018-02-14 14:19:00 +01:00
Matej Zrimšek
d423700e84
Used permissions where they were missing.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
321ddc2916
Grouped existing project permissions and used 'canaid' gem.
2018-02-14 13:09:45 +01:00
Zanz2
a6356d2420
Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines
2018-02-07 14:46:25 +01:00
Zanz2
efaf5ad721
Commands now get styled like code
2018-02-07 13:51:22 +01:00
Zanz2
a6e93b8e35
Fixed hound line too long
2018-02-07 13:04:02 +01:00
Zanz2
e56c0bb100
Tables are now always atleast 5x5, like in scinote when creating new table
2018-02-07 10:55:44 +01:00
Zanz2
f7f46a094e
Fixed PR and a mistake i made
2018-02-07 09:53:49 +01:00
Zanz2
167cbc98e5
Merge branch 'master' into yellow_flashv3_SCI1834
2018-02-07 09:42:56 +01:00
Zanz2
80735f2412
Fixed the bug with big text difference in preview and imported protocol
2018-02-07 09:26:45 +01:00
Zanz2
a37d4f3cde
there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally
2018-02-06 15:46:03 +01:00
Zanz2
a2df9777f6
Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000
...
fixed empty table name unable to generate reports bug [SCI-2000]
2018-02-06 14:34:31 +01:00
Zanz2
83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807
...
Images not imported [SCI-1807]
2018-02-06 14:33:35 +01:00
Zanz2
f9c6eafe49
most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit
2018-02-06 12:04:24 +01:00
Zanz2
9b5ddc6789
moved code from older branch to new master
2018-02-06 11:03:17 +01:00
Zanz2
748af2cbf7
Fixed the issue, table name defaults to empty string space now
2018-02-06 10:29:49 +01:00
mlorb
553039b7b4
fix type error at changing task at navigation bar after seting due date
2018-01-30 13:29:54 +01:00
Zanz2
0607579d06
Fixes the database error i was having on home machine too, wasnt exclusive to me
2018-01-27 14:57:07 +01:00
Zanz2
70a972c264
Fixed pr and small oversight
2018-01-27 14:33:01 +01:00
Zanz2
98b3ddbdb0
Merge branch 'master' into images_not_imported_SCI1807
2018-01-26 15:13:40 +01:00
Zanz2
a15e624b06
Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995
...
Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]
2018-01-26 15:08:03 +01:00
Zanz2
48b48c945c
Refactored hound errors, now that rubocop works
2018-01-26 11:17:49 +01:00
Zanz2
020e9ddc16
Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807
2018-01-26 11:08:47 +01:00
Zanz2
a48fc168a9
deleted un needed function
2018-01-26 11:05:19 +01:00
Zanz2
6f56f829da
Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title
2018-01-26 10:49:38 +01:00
Zanz2
4ee51959eb
fixed hound
2018-01-26 09:56:59 +01:00
Zanz2
4ed1555ebb
small fix, ordering
2018-01-26 09:45:41 +01:00
Zanz2
346f9feaef
Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html
2018-01-26 09:34:58 +01:00
Zanz2
24e772d7e5
Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816
2018-01-26 08:26:38 +01:00
Zanz2
00ac774fde
Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result
2018-01-24 13:40:13 +01:00
Zanz2
7fe1c20ebe
Finished the protocol reorder functions and implemented them
2018-01-24 09:31:43 +01:00
Zanz2
96253c1089
Made some functions to help solve reordering of the protocols io steps
2018-01-23 18:40:23 +01:00
zmagod
f8a3fca2db
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
2018-01-23 11:06:33 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor
...
Protocols.io code beautification and refactoring [SCI-1929]
2018-01-12 12:34:00 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866
...
Wrong date at activity
2018-01-08 14:20:26 +01:00
zmagod
eb8124ea5a
follow @duco 's suggestions
2018-01-05 17:08:00 +01:00
mlorb
99185871c4
fix naming things
2018-01-05 15:15:50 +01:00
Zanz2
7bad722553
Made small oversight and fixed it
2017-12-24 02:06:14 +01:00
Zanz2
83e1b04c7a
Fixed pull request
2017-12-24 01:49:04 +01:00
Zanz2
53561ffd84
Refactored according to PR
2017-12-15 20:39:15 +01:00
mlorb
2936770c01
refactor can view team users ATWHO permission
2017-12-14 14:18:18 +01:00
mlorb
7c1ae6bc82
refactor manage repository permissions
2017-12-14 14:18:18 +01:00
mlorb
2918a9833d
refactor manage repository column permissions
2017-12-14 14:18:18 +01:00
mlorb
3f5e9e60b7
refactor view repository permission
2017-12-14 14:18:18 +01:00
mlorb
079ac7a4d3
refactor manage repository row permissions
2017-12-14 14:18:18 +01:00
mlorb
740ecc674b
refactor view repositories permission
2017-12-14 14:18:18 +01:00
mlorb
3ca51f097f
refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions
2017-12-14 14:18:17 +01:00
mlorb
29f9414839
refactor create project permission
2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe
refactor update/delete sample permissions
2017-12-14 14:18:17 +01:00
mlorb
b09377cd8d
refactor update sample permission
2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6
refactor view/export samples permission
2017-12-14 14:18:16 +01:00
mlorb
0d37f9c85a
refactor clone protocol permission
2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2
refactor update protocol type in repository
2017-12-14 14:18:16 +01:00
mlorb
806fcbce36
refactor update protocol in repository permission
2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e
refactor read protocol in repository permission
2017-12-14 14:18:15 +01:00
mlorb
ccc2451494
refactor create sample permissions
2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1
refactor create protocol permission
2017-12-14 14:18:14 +01:00
mlorb
a0b2d3f5ef
refactor read_team permission
2017-12-14 14:18:14 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
...
Fixes bug with embedded images [SCI-1624]
2017-12-12 09:53:24 +01:00
Oleksii Kriuchykhin
6256acdfea
Rename notifications settings accessor [SCI-1864]
2017-12-07 13:59:33 +01:00
Zanz2
b0012ab936
Simplified repeating method calls
2017-12-03 16:50:06 +01:00
Zanz2
fcbd956d6e
Finished code beautification
2017-12-03 01:17:49 +01:00
Zanz2
835ac6910f
Code refactor part 1
2017-12-02 00:29:47 +01:00
Zmago Devetak
205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650
...
Adds task to copy images [fixes SCI-1650]
2017-12-01 17:32:09 +01:00
zmagod
7442684846
fix protocol preview, remove unneeded functions, fix copy paste tokens
2017-11-28 14:16:20 +01:00
zmagod
e233fbe1d8
fix image removing from tinymce
2017-11-28 11:01:07 +01:00
zmagod
e69e9f6794
remove unneeded comment and add tiny_mce_asset regex in a constant
2017-11-24 17:04:01 +01:00
zmagod
066c782cd2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step
2017-11-24 16:29:32 +01:00
Zanz2
0e574b2f15
removed un needed limits
2017-11-24 11:49:57 +01:00
Zanz2
e7e37939a9
quick fix to expected result losing html
2017-11-24 11:18:12 +01:00
Zanz2
dc5904aed9
Fixed this jira issue and added workarounds for bugs
2017-11-24 01:45:40 +01:00
mlorb
c46d630f0b
Merge pull request #891 from mlorb/ml-sci-1617
...
Add copying of TinyMce assets when cloning the protocol [SCI-1617]
2017-11-23 14:31:29 +01:00
Zanz2
764e5259d1
Fixed last review, and a bug i found
2017-11-22 23:38:22 +01:00
Mojca Lorber
fe5828fa97
add copying of TinyMce assets when cloning the protocol
2017-11-22 16:47:21 +01:00
Zanz2
692ed62d6d
made case statement nicer
2017-11-21 21:27:19 +01:00
Zanz2
f577bf93b5
Fixed pull request review
2017-11-21 19:20:15 +01:00
Zanz2
8226322e92
Fixed open html tags on truncate
2017-11-21 11:42:42 +01:00
Zanz2
529d988cc3
closing html tags
2017-11-21 11:15:09 +01:00
Zanz2
d8c809ffd0
Reviewed pull request
2017-11-20 23:19:34 +01:00
Zanz2
e943df9176
fixed small rubocop error
2017-11-20 01:02:02 +01:00
Zanz2
cf66d94d45
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
2017-11-20 00:59:32 +01:00
Zanz2
99b16f339d
New maximums, functions reworked
2017-11-17 15:16:17 +01:00
Zanz2
fa25a6785b
Made the propper files and functionality for the text truncation to function
2017-11-17 02:43:32 +01:00
Zanz2
c44465817d
Added the functions and put in limitations from my validations files, changed controller name, added some locals
2017-11-16 20:03:44 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import
...
Protocols io import
2017-11-13 11:53:28 +01:00
Zanz2
e26adc2905
Quick formatting fix
2017-11-12 15:41:50 +01:00
Zanz2
e7384ac38d
Code review fixes, made seperate helper file
2017-11-12 15:31:04 +01:00
Luka Murn
82f982e983
Merge branch 'rails-5.1' into decoupling-settings-page
...
Conflicts:
Gemfile
Gemfile.lock
2017-10-23 10:59:10 +02:00
Luka Murn
8254153bb9
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
app/models/connection.rb
app/models/experiment.rb
app/models/my_module.rb
2017-10-23 08:57:57 +02:00
Luka Murn
4e06b5c397
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
2017-10-17 13:17:49 +02:00
Luka Murn
4d8f2665d3
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
2017-10-17 13:10:02 +02:00
Luka Murn
2fb2b90da3
Merge pull request #820 from Ducz0r/lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675]
2017-10-16 13:05:43 +02:00
okriuchykhin
db9a031581
Merge pull request #813 from okriuchykhin/ok_SCI_1642
...
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
gazvoda
88f03a0706
Merge pull request #735 from gazvoda/lg-SCI-1249-v2
...
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
Luka Murn
fe89b942e7
Add Add-ons page to User -> Settings -> Account
...
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
lenart
de3c18509f
Variable name changes, added comments to code [fixes SCI-1249]
2017-10-06 17:12:15 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +02:00
zmagod
ef1025e0ee
fixes hound
2017-10-02 18:11:54 +02:00
zmagod
3dc3ed906f
fixes bug with embedded images [fixes SCI.1624]
2017-10-02 18:06:42 +02:00
Luka Murn
e078ae4f77
Merge branch 'rails-5.1' into decoupling-settings-page
2017-09-21 08:36:09 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
Luka Murn
9227ea5854
Finish the user settings jsonb, also fix references throughout app
...
Closes SCI-1475.
2017-08-10 14:29:01 +02:00
lenart
e781dfc6a6
Truncate activity taking smart annotations into account fixes [SCI-1249]
2017-08-02 15:51:32 +02:00
Matej Zrimšek
07fea16d26
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
2017-07-28 12:01:11 +02:00
Luka Murn
3e80f761b8
Add "about" modal, prepare hooks, VERSION system for addons
...
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
lenart
58e2575c75
Truncate checklist items in activity modal [fixes SCI-1249]
2017-07-07 15:56:16 +02:00
zmagod
7b9410f02f
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 11:26:32 +02:00
zmagod
2b2f513366
fixes export pdf error on production
2017-06-22 16:40:50 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
Mojca Lorber
107aa76e55
fix bug with audit trail - ajax error
2017-06-14 14:48:22 +02:00
okriuchykhin
97a94ff4a3
Merge pull request #679 from okriuchykhin/ok_SCI_1345
...
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 15:47:44 +02:00
mlorb
074a47aae1
Merge pull request #675 from mlorb/ml_sci_1272
...
Fix permissions [SCI-1272]
2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin
2d693a3fb7
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 10:33:08 +02:00
Luka Murn
2e2f07bf58
Merge pull request #668 from Ducz0r/lm-sci-1335
...
Fix sidebar for repositories [SCI-1335]
2017-06-13 09:37:33 +02:00
Luka Murn
c3d289291f
Fix case statement
...
Closes SCI-1335.
2017-06-13 09:09:07 +02:00
Zmago Devetak
6cdf37041f
Merge pull request #663 from ZmagoD/zd_SCI_1328
...
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-13 08:57:09 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
Luka Murn
481a48c953
Hound is love, Hound is life
2017-06-09 12:51:33 +02:00
Luka Murn
cfb734704e
Fix sidebar for repositories
...
Closes SCI-1335.
2017-06-09 12:49:23 +02:00
zmagod
e45c2ce560
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-08 13:41:27 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Luka Murn
02dd6636ba
Allow saving & editing of reports with repository elements
...
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f
fix hound
2017-06-06 13:33:57 +02:00
Mojca Lorber
da98788031
small code fixes
2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Luka Murn
62d97f6e64
Merge pull request #655 from Ducz0r/lm-sci-1321
...
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
2017-06-06 07:59:24 +02:00
Luka Murn
f298ec54e7
Code beautification per @zmagod's request
...
Closes SCI-1321.
2017-06-06 07:58:46 +02:00
Luka Murn
8c7aebbb88
Fix bug with TinyMCE not working for steps with nil description
...
Closes SCI-1321.
2017-06-05 17:43:03 +02:00
Matej Zrimšek
419d638163
Renamed reposiotry edit and destroy permission helper. [fix 1269]
2017-06-05 17:36:26 +02:00
Mojca Lorber
27d3a5097b
fix hound
2017-06-05 16:07:21 +02:00
Matej Zrimšek
5c9a453439
Added permissions for deleting and renaming of repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
Mojca Lorber
7c2b657b0e
fix bug with special characters when truncating activities titles
2017-06-01 15:10:26 +02:00
Mojca Lorber
d88b21fb5e
truncate all titles in activities
2017-06-01 15:09:01 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
Matej Zrimšek
19ffd77d32
Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]
2017-05-26 18:14:15 +02:00
Oleksii Kriuchykhin
157b1630b9
Add missing include for sinitize_input [SCI-1309]
2017-05-25 16:28:06 +02:00
mlorb
58ac457d38
fix merge bug
2017-05-23 11:32:02 +02:00
mlorb
872f712be8
Merge branch 'custom-repositories' into ml_sci_1266_v2
2017-05-23 11:05:25 +02:00
Mojca Lorber
9ae615264d
add global repositories screen - tab control
2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
Oleksii Kriuchykhin
ad39d09a53
Disable turbolinks on search links to fix JS errors [SCI-452]
2017-05-12 13:23:29 +02:00
Zmago Devetak
9911c0d148
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
...
replace all ActionController::Base.helpers.sanitize calls with custom…
2017-05-11 14:30:26 +02:00
zmagod
80a0af8c9f
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
2017-05-11 11:36:47 +02:00
okriuchykhin
f239238064
Merge pull request #611 from okriuchykhin/ok_SCI_1252
...
Fix root_url method unavailable in application_helper [SCI-1252]
2017-05-11 11:15:00 +02:00
Oleksii Kriuchykhin
229693ec61
Fix root_url method unavailable in application_helper [SCI-1252]
2017-05-10 18:15:08 +02:00
zmagod
511f39e093
add constants
2017-05-10 15:33:33 +02:00
zmagod
10db322307
fixes input sanitize method [fixes SCI-1248]
2017-05-10 14:57:11 +02:00
Zmago Devetak
13570ba5cb
Merge pull request #602 from ZmagoD/zd_SCI_1247
...
fixes pdf export and image size [fixes SCI-1247]
2017-05-10 09:31:55 +02:00
Zmago Devetak
cd503580b2
Merge pull request #599 from ZmagoD/zd_SCI_1241
...
fix samples bug [SCI-1241]
2017-05-09 15:55:43 +02:00
Mojca Lorber
7ca62a16bb
fix hound
2017-05-09 14:55:23 +02:00
Mojca Lorber
e1475fbfef
fix bug with avatar in system log
2017-05-09 14:40:02 +02:00
zmagod
2d69896897
fixes pdf export and image size [fixes SCI-1247]
2017-05-09 13:59:59 +02:00
zmagod
df13478186
fix samples bug [SCI-1241]
2017-05-09 11:25:00 +02:00
Zmago Devetak
4b816f5322
Merge pull request #568 from ZmagoD/zd_SCI_1119
...
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
zmagod
d6f303581f
refactor
2017-05-08 12:56:33 +02:00
Zmago Devetak
e47bf8f013
Merge pull request #582 from ZmagoD/zd_SCI_1051
...
fix reports pdf for user annotation [SCI-1051]
2017-05-08 10:24:40 +02:00
zmagod
b22350136f
adds label to step in report [fixes SCI-488]
2017-05-05 09:45:18 +02:00
zmagod
289a148332
refactor
2017-05-03 15:33:23 +02:00
zmagod
5b58824ec0
refactor
2017-05-03 15:30:08 +02:00
zmagod
1b618e88e5
fix reports pdf for user annotation [SCI-1051]
2017-05-03 10:50:43 +02:00
osboxes.org
21a39fc704
Code indentation corrected [fixes SCI-1214]
2017-04-28 10:31:14 +01:00
osboxes.org
f72802f9f2
Tab Teams is highlighted when in Audit trails [fixes SCI-1214]
2017-04-26 16:31:44 +01:00
zmagod
1fefeee3d1
adds team space related methods
2017-04-25 13:44:31 +02:00
zmagod
66f43803c0
refactor, fix user annotation bug
2017-04-24 16:22:25 +02:00
zmagod
55c8c498e2
add image upload functionality to result text
2017-04-24 12:28:27 +02:00
zmagod
550f563666
working version for steps first run
2017-04-21 16:09:04 +02:00
zmagod
c25df63a14
add tinymce img importer and refactor input sanitize helper
2017-04-19 09:11:52 +02:00
okriuchykhin
0fe84c4e24
Merge pull request #550 from okriuchykhin/ok_SCI_1157
...
Improve speed of search [SCI-1157]
2017-04-12 13:11:26 +02:00
Oleksii Kriuchykhin
07d658ab82
Improve speed of search [SCI-1157]
2017-04-11 14:55:44 +02:00
Zmago Devetak
91793c295a
Merge pull request #542 from ZmagoD/zd_SCI_825
...
Smart annotations and Notifications
2017-04-10 15:10:17 +02:00
zmagod
90faeec410
fixes typos and protocol step links
2017-04-10 11:21:28 +02:00
zmagod
9bb1bb3f9b
refactor [fixes SCI-825]
2017-04-06 15:08:03 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
Mojca Lorber
a0fe47a05d
change helper method for user info popover
2017-04-04 15:22:41 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin
2faa137f67
Add user popover method for users [SCI-1127]
2017-04-03 15:10:00 +02:00
zmagod
239a44c26b
change send to public_send
2017-03-24 16:25:50 +01:00
zmagod
4635a3320d
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-24 16:09:28 +01:00
zmagod
5cc6cd094e
refactor
2017-03-17 16:47:58 +01:00
zmagod
95a0f596b7
adds file link
2017-03-17 16:40:57 +01:00
zmagod
856a4611c6
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-14 15:58:08 +01:00
zmagod
b821fff4a5
adds non breaking space between file name and buttons
2017-03-13 14:14:44 +01:00
zmagod
7b16e5643e
fix assets preprocesor for wopi files
2017-03-13 13:20:49 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
mlorb
39e1ac4b26
Merge pull request #512 from biosistemika/ml_sci_1074
...
Fix permissions for experiment actions [SCI-1074]
2017-03-10 11:44:27 +01:00
Mojca Lorber
1ba5f1748f
fix permissions for experiment actions
2017-03-09 17:45:34 +01:00
zmagod
1d42d46c02
fixes bug with step comments
2017-03-09 16:02:52 +01:00
zmagod
9939d8df06
refactor
2017-03-09 10:51:54 +01:00
zmagod
f78ef8c82a
fixes hound
2017-03-08 14:41:42 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Mojca Lorber
f84611f558
fix report - checklist items are in separate row than checkboxes
2017-02-22 15:51:26 +01:00
okriuchykhin
8e18ff44a6
Merge pull request #479 from okriuchykhin/ok_SCI_999
...
Add task complete/uncomplete functionality [SCI-999]
2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin
218e96b1f0
Code style fixes [SCI-999]
2017-02-16 11:45:07 +01:00
Luka Murn
164bd787e9
Merge pull request #481 from Ducz0r/lm-sci-958-fix
...
Team administrators are Viewers of all Projects in Team [SCI-958]
2017-02-15 10:40:52 +01:00
Nbernot
97584aabb3
Updated the lists of office online file extensions
...
Extended the list of file extensions that receive office online icons and 'open in' text.
2017-02-14 16:44:03 +01:00
Luka Murn
c6ed73bc82
Allow team admins to see all projects, even hidden ones
2017-02-13 13:42:53 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +01:00
Mojca Lorber
d3e0eca44e
redesign individual team page
2017-02-01 14:44:47 +01:00
zmagod
e59b2e039a
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
2017-01-27 11:15:31 +01:00
Luka Murn
3bf447b0f4
Fix bug where reCaptcha form wasn't working
2017-01-26 16:06:29 +01:00
Luka Murn
0baaf12de3
Re-display images & checkboxes in PDF reports
...
Closes SCI-953.
2017-01-26 10:46:58 +01:00
Luka Murn
8c5a52417c
Merge pull request #445 from okriuchykhin/ok_SCI_940
...
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:49:38 +01:00
Oleksii Kriuchykhin
c55f3cb99c
Add flag to disable simple_format in custom_auto_link [SCI-940]
2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
5fe9261595
Fix error when referencing deleted sample in SA [SCI-949]
2017-01-25 15:54:12 +01:00
zmagod
a507bb4d1f
hound
2017-01-25 15:40:35 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
zmagod
9ae799d52c
rename organization/org/Organization to Team in datatables
2017-01-25 09:48:49 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
Zmago Devetak
40bf293ec7
Merge pull request #441 from ZmagoD/zd_SCI_924
...
adds smart annotation in task comments, refactor smart_annotation_par…
2017-01-24 11:18:41 +01:00
okriuchykhin
7fa1f3d966
Merge pull request #438 from okriuchykhin/ok_SCI_921
...
Remove unneeded HTML scrubber in protocol importer [SCI-921]
2017-01-24 11:02:43 +01:00
zmagod
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +01:00
Oleksii Kriuchykhin
2434c73a0c
Remove unneeded HTML scrabber in protocol importer [SCI-921]
2017-01-24 09:52:38 +01:00
zmagod
20cde2654b
fixed user without permissions bug [fixes SCI-922]
2017-01-23 10:53:42 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
Zmago Devetak
1b9f7db385
Merge pull request #405 from ZmagoD/zd_SCI_832
...
Visualization of User smart annotation after saving the field
2017-01-18 09:36:42 +01:00
okriuchykhin
781a68e0d5
Merge pull request #415 from okriuchykhin/ok_SCI_888
...
Add missed space in the string [SCI-888]
2017-01-18 09:34:51 +01:00
zmagod
cb0483a6e6
refactor
2017-01-18 08:34:29 +01:00
Oleksii Kriuchykhin
ea8f6a8c6b
Fix issue in report editor [SCI-102]
2017-01-17 14:21:59 +01:00
Oleksii Kriuchykhin
0ce71884a5
Add missed space in the string [SCI-888]
2017-01-16 17:09:41 +01:00
Luka Murn
a2935c6620
Add sample info modal popup to sample smart annotations
...
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').
Closes SCI-892.
2017-01-16 15:52:02 +01:00
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +01:00
Oleksii Kriuchykhin
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
zmagod
3a1ec0eb5e
refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]
2017-01-11 14:56:47 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
a903772de8
style dropdown
2017-01-10 17:05:32 +01:00
zmagod
e0e998a0d8
add smart annotation parser helper
2017-01-10 14:14:21 +01:00
mz3944
ef431da2db
Merge pull request #389 from mz3944/mz-sci-848
...
Unable to delete samples [SCI-848]
2017-01-09 11:57:48 +01:00
Matej Zrimšek
5d104981fd
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00