scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 01:44:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
6571 commits 44 branches 180 tags 166 MiB
Commit graph

6571 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anton Ignatov
5b8e1fedf1 Fix markup 2019-11-18 13:59:54 +01:00
Anton Ignatov
7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Anton Ignatov
17e457c686 Finished global activities refactoring 2019-11-18 13:59:54 +01:00
Anton Ignatov
fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
Anton Ignatov
4e517ca6c4 Fix eslint for main file 2019-11-18 13:59:54 +01:00
Anton Ignatov
7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
Anton Ignatov
f832cfbbd4 Added tags 2019-11-18 13:59:54 +01:00
Anton Ignatov
04bd5269ec Created new dropdown selector 2019-11-18 13:59:54 +01:00
aignatov-bio
b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030) 
* Fix global activities jsonb field

* Fix tests
 2019-11-18 13:59:54 +01:00
Urban Rotnik
759b3acfe9
Merge pull request #2214 from biosistemika/features/task-api-endpoints 
Develop << Features/task api endpoints
 2019-11-18 11:16:44 +01:00
Urban Rotnik
dcfca76602 Update method 'update_canvas' to work with new DB constraint 2019-11-18 11:11:41 +01:00
Urban Rotnik
54c473fa6b Tests fix 2019-11-18 11:11:41 +01:00
Urban Rotnik
b8bf7bbd9b Rename validation 2019-11-18 11:11:40 +01:00
Urban Rotnik
d5716c4260 Add rake task for fixing invalid canvas positions 2019-11-18 11:11:40 +01:00
Urban Rotnik
43e3763ec8 Update x, y, experiment unqiue validation 
[SCI-3887]
 2019-11-18 11:11:40 +01:00
Urban Rotnik
06ab087033 Rubocop schema update, exclude some rules for specs 2019-11-18 11:11:39 +01:00
Urban Rotnik
5e97116c5a Update results params 2019-11-18 11:11:39 +01:00
Urban Rotnik
8b5e346770 Remove file deletion manually 2019-11-18 11:11:39 +01:00
Urban Rotnik
cc9d987321 Add update result(file) and create result(file) API endpoint 2019-11-18 11:11:38 +01:00
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