Commit graph

6552 commits

Author SHA1 Message Date
Urban Rotnik
060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik
1be88baab1 Add API endpoint for Attachments resource 2019-11-18 11:11:38 +01:00
Urban Rotnik
e7083e188c Add API endpoint for Step resource
[SCI-3835]
2019-11-18 11:11:37 +01:00
Urban Rotnik
24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
Urban Rotnik
7802d5ee8b Add uniq validation for x and y position scoped to experiment 2019-11-18 11:11:36 +01:00
aignatov-bio
3eb6f5695b
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
2019-11-18 09:11:10 +01:00
aignatov-bio
a5666cacc5 Fix markup 2019-11-15 16:28:08 +01:00
aignatov-bio
b9a34fa809 Fix placeholder for authors 2019-11-15 16:23:48 +01:00
aignatov-bio
d88d479854
Merge pull request #2175 from aignatov-bio/ai-sci-4007-error-at-click-to-share-button
Add check for existing elements for shared repository modal [SCI-4007]
2019-11-15 14:32:46 +01:00
aignatov-bio
b979435b35
Merge pull request #2199 from aignatov-bio/ai-sci-4055-fix-eln-export-for-files-without-extension
Fix eln export for file without extension [SCI-4055]
2019-11-15 14:16:07 +01:00
Alex Kriuchykhin
d1a324401e
Merge pull request #2210 from biosistemika/release_1_17_6
Master << Release 1.17.6
2019-11-14 11:46:51 +01:00
aignatov-bio
ca76c0ca0c Fix cucmber tests 2019-11-13 16:24:19 +01:00
aignatov-bio
f729baf884 Fix cucumber tests 2019-11-13 15:10:37 +01:00
aignatov-bio
1488f75e26 Add activities 2019-11-13 13:57:04 +01:00
Alex Kriuchykhin
8b665d4f1c
Merge pull request #2193 from okriuchykhin/ok_SCI_4028
Fix reports in team importer [SCI-4028]
2019-11-13 13:10:15 +01:00
Alex Kriuchykhin
6a9734e310
Bump version to 1.17.6 2019-11-13 10:14:38 +01:00
aignatov-bio
3df12bbd7b
Merge pull request #2208 from aignatov-bio/ai-sci-4073-fix-autocompete-tinymnce-for-mozzila
Disable autocomplete for textarea fields [SCI-4073]
2019-11-12 14:47:24 +01:00
aignatov-bio
19f5f9de67 Disable autocomplete for textarea field 2019-11-12 14:44:33 +01:00
aignatov-bio
a356c290ea Fix markup 2019-11-12 11:32:43 +01:00
aignatov-bio
4a8eb041cb Fix markup 2019-11-12 11:31:26 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Alex Kriuchykhin
22962256cf
Merge pull request #2204 from urbanrotnik/ur-sci-4067-text-description-overwritten
Fix for step description overwriting [SCI-4067]
2019-11-11 10:58:32 +01:00
Alex Kriuchykhin
c1a77890d9
Merge pull request #2205 from okriuchykhin/ok_SCI_4060
Bump loofah from 2.2.3 to 2.3.1
2019-11-11 10:42:50 +01:00
Urban Rotnik
1d180f3688 Fix for step description overwriting
[SCI-4067]
2019-11-11 10:31:55 +01:00
Oleksii Kriuchykhin
c49995a92b Bump loofah from 2.2.3 to 2.3.1 2019-11-11 10:17:19 +01:00
Alex Kriuchykhin
570cfefa6e
Merge pull request #2202 from biosistemika/dependabot/bundler/loofah-2.3.1
Bump loofah from 2.2.3 to 2.3.1
2019-11-11 09:55:09 +01:00
dependabot[bot]
3bfaae49f6
Bump loofah from 2.2.3 to 2.3.1
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-07 23:51:30 +00:00
Alex Kriuchykhin
04c157d73b
Merge pull request #2201 from okriuchykhin/ok_SCI_4057
Fix service_url for local storage [SCI-4057]
2019-11-07 15:43:01 +01:00
aignatov-bio
cf2687f7e5 Merge branch 'ml-sci-4004' of https://github.com/mlorb/scinote-web into mlorb-ml-sci-4004 2019-11-07 13:03:02 +01:00
aignatov-bio
938ea259cc
Merge pull request #2195 from aignatov-bio/ai-sci-4051-fix-team-import-for-avatars
Fix team import for user with avatars [SCI-4051]
2019-11-07 13:02:30 +01:00
Oleksii Kriuchykhin
b646295698 Fix service_url for local storage [SCI-4057] 2019-11-06 15:21:56 +01:00
aignatov-bio
e4a39bbbe4 Add check for files 2019-11-06 14:41:51 +01:00
Alex Kriuchykhin
174a98778e
Bump version to 1.17.5 2019-11-06 11:17:18 +01:00
aignatov-bio
0c5ce90895 Fix eln export for file without extension 2019-11-06 09:53:44 +01:00
Alex Kriuchykhin
522d236e10
Merge pull request #2198 from okriuchykhin/ok_SCI_4053
Fix TinyMCE images in protocol cloning [SCI-4053]
2019-11-05 18:15:22 +01:00
Oleksii Kriuchykhin
b2eda231a0 Fix TinyMCE images in protocol clonning [SCI-4053] 2019-11-05 18:13:44 +01:00
Alex Kriuchykhin
95686a9275
Merge pull request #2197 from okriuchykhin/ok_SCI_4053
Fix TinyMCE image URLs in the editor [SCI-4053]
2019-11-05 13:46:48 +01:00
Oleksii Kriuchykhin
67fdda1eeb Fix TinyMCE image URLs in the editor [SCI-4053] 2019-11-05 13:38:47 +01:00
aignatov-bio
384b9b7cd8
Merge pull request #2196 from aignatov-bio/ai-sci-4050-update-avatars
Update avatars and small CSS fixes [SCI-4050]
2019-11-05 11:49:34 +01:00
aignatov-bio
b6292a029e Fix localization 2019-11-05 10:46:05 +01:00
aignatov-bio
ae0db3a7bc Update avatars and small CSS fixes 2019-11-05 10:43:02 +01:00
aignatov-bio
b56a997aef Fix team import for user with avatars 2019-11-04 14:53:59 +01:00
Mojca Lorber
16eddc0ad0 Save on click away, inline editing 2019-11-03 14:59:30 +01:00
Alex Kriuchykhin
ec66ab8654
Merge pull request #2190 from mlorb/ml-sci-4023
Small improvements in the avatar settings [SCI-4023]
2019-10-30 16:02:24 +01:00
Oleksii Kriuchykhin
1e748f2d7e Fix reports in team importer [SCI-4028] 2019-10-30 15:47:11 +01:00
Mojca Lorber
a3ded83292 Small css change 2019-10-30 15:42:11 +01:00
Mojca Lorber
88faeb5178 Change avatars again 2019-10-30 15:30:04 +01:00
Mojca Lorber
7b86a3932a Additional avatar small fixes 2019-10-30 15:23:14 +01:00
Alex Kriuchykhin
2e4f444f63
Merge pull request #2191 from okriuchykhin/ok_SCI_4047
Fix LinkedIn sign-up [SCI-4047]
2019-10-29 16:29:13 +01:00
Oleksii Kriuchykhin
ab691efdb2 Fix LinkedIn sign-up [SCI-4047] 2019-10-29 16:20:19 +01:00