scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity
6494 commits 39 branches 184 tags 168 MiB
Commit graph

6494 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleksii Kriuchykhin
ab691efdb2 Fix LinkedIn sign-up [SCI-4047] 2019-10-29 16:20:19 +01:00
Oleksii Kriuchykhin
91b4c54c58 Fix ChromeDriver and Chrome versions for test environment [SCI-4047] 2019-10-29 11:29:16 +01:00
Alex Kriuchykhin
e4ca0cdb5a
Merge pull request #2188 from biosistemika/dependabot/bundler/rubyzip-1.3.0 
Bump rubyzip from 1.2.4 to 1.3.0
 2019-10-29 10:51:57 +01:00
Alex Kriuchykhin
853d1a16bf
Merge pull request #2187 from biosistemika/dependabot/bundler/bootstrap-sass-3.4.1 
Bump bootstrap-sass from 3.3.7 to 3.4.1
 2019-10-29 10:50:23 +01:00
Alex Kriuchykhin
5703b56000
Merge pull request #2186 from biosistemika/dependabot/npm_and_yarn/lodash-es-4.17.15 
Bump lodash-es from 4.17.11 to 4.17.15
 2019-10-29 10:42:30 +01:00
Alex Kriuchykhin
ec079a302d
Merge pull request #2185 from biosistemika/dependabot/npm_and_yarn/eslint-utils-1.4.3 
Bump eslint-utils from 1.3.1 to 1.4.3
 2019-10-29 10:42:11 +01:00
Alex Kriuchykhin
336d336b53
Merge pull request #2184 from biosistemika/dependabot/npm_and_yarn/mixin-deep-1.3.2 
Bump mixin-deep from 1.3.1 to 1.3.2
 2019-10-29 10:41:44 +01:00
Alex Kriuchykhin
f5020d20e9
Merge pull request #2183 from biosistemika/dependabot/npm_and_yarn/lodash-4.17.13 
Bump lodash from 4.17.11 to 4.17.13
 2019-10-29 10:41:26 +01:00
Alex Kriuchykhin
5ff81115ad
Merge pull request #2182 from biosistemika/dependabot/npm_and_yarn/lodash.template-4.5.0 
Bump lodash.template from 4.4.0 to 4.5.0
 2019-10-29 10:41:03 +01:00
Alex Kriuchykhin
264ff64b37
Merge pull request #2181 from biosistemika/dependabot/npm_and_yarn/lodash.merge-4.6.2 
Bump lodash.merge from 4.6.1 to 4.6.2
 2019-10-29 10:40:21 +01:00
dependabot[bot]
462c4ed92f
Bump rubyzip from 1.2.4 to 1.3.0 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.4...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:45 +00:00
dependabot[bot]
03f5b87b8e
Bump bootstrap-sass from 3.3.7 to 3.4.1 
Bumps [bootstrap-sass](https://github.com/twbs/bootstrap-sass) from 3.3.7 to 3.4.1.
- [Release notes](https://github.com/twbs/bootstrap-sass/releases)
- [Changelog](https://github.com/twbs/bootstrap-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-sass/compare/v3.3.7...v3.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:37 +00:00
dependabot[bot]
4d2a369264
Bump lodash-es from 4.17.11 to 4.17.15 
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:33 +00:00
dependabot[bot]
5e3888c1ec
Bump eslint-utils from 1.3.1 to 1.4.3 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.3.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:29 +00:00
dependabot[bot]
dd35738fbc
Bump mixin-deep from 1.3.1 to 1.3.2 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:26 +00:00
dependabot[bot]
5f640c64c2
Bump lodash from 4.17.11 to 4.17.13 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:26 +00:00
dependabot[bot]
934214e739
Bump lodash.template from 4.4.0 to 4.5.0 
Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:25 +00:00
dependabot[bot]
57fbba0728
Bump lodash.merge from 4.6.1 to 4.6.2 
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 09:34:25 +00:00
Alex Kriuchykhin
ba3a5e5460
Merge pull request #2159 from mlorb/ml-sci-3816-v2 
Fix reloading of datatables header again [SCI-3816]
 2019-10-29 10:33:04 +01:00
Alex Kriuchykhin
16dc2d0fe0
Merge pull request #2130 from jbargu/jg_sci_3920 
[SCI-3920] Add omniauth initializer
 2019-10-29 10:29:26 +01:00
Urban Rotnik
169a381629
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download 
Fix for downloading image [SCI-4008]
 2019-10-22 15:12:11 +02:00
Urban Rotnik
a7d351dc38 Add file size check 2019-10-22 14:13:22 +02:00
Alex Kriuchykhin
e333e7c44a
Merge pull request #2173 from biosistemika/release_1_17_4 
Merge release 1.17.4 to master
 2019-10-22 13:21:02 +02:00
Alex Kriuchykhin
5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3 
Merge release 1.17.3 to master
 2019-10-22 12:45:02 +02:00
Urban Rotnik
0119533e75 Fix for file generation 2019-10-22 11:02:59 +02:00
Alex Kriuchykhin
6d1ae38c59
Bump version to 1.17.4 2019-10-22 10:20:53 +02:00
Urban Rotnik
ce9f1b1309 Add mceToken check 2019-10-22 08:28:35 +02:00
Alex Kriuchykhin
4f952a6523
Merge pull request #2167 from okriuchykhin/ok_SCI_4003 
Fix issue with empty cells for xlsx inventory imports [SCI-4003]
 2019-10-21 14:03:27 +02:00
Oleksii Kriuchykhin
6c57f56bf4 Fix issue with empty cells for xlsx inventory imports [SCI-4003] 2019-10-21 12:06:45 +02:00
Alex Kriuchykhin
61805cb837
Bump version to 1.17.3 2019-10-18 13:35:48 +02:00
Alex Kriuchykhin
95dced18fd
Merge pull request #2164 from okriuchykhin/ok_SCI_3999 
Fix protocols table select all checkbox [SCI-3999]
 2019-10-17 17:06:59 +02:00
Oleksii Kriuchykhin
4cba412e31 Fix protocols table select all checkbox [SCI-3999] 2019-10-17 17:05:01 +02:00
Alex Kriuchykhin
34f9e6265c
Merge pull request #2162 from okriuchykhin/ok_SCI_3990 
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
 2019-10-17 17:03:11 +02:00
Alex Kriuchykhin
62cf439734
Merge pull request #2163 from biosistemika/SCI-3994-excel-import-to-inventory-fails-v2 
SCI-3994 fix for excel import
 2019-10-17 16:53:32 +02:00
Miha Mencin
0af8629f98 SCI-3994 fix for excel import 2019-10-17 14:37:11 +02:00
Oleksii Kriuchykhin
2637aed853 Fix code styling [SCI-3990][SCI-3993] 2019-10-17 13:38:36 +02:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Mojca Lorber
b78211e3ca Fix reloading of datatables header again 2019-10-16 13:02:41 +02:00
aignatov-bio
ba9edcdbe1
Merge pull request #2157 from aignatov-bio/ai-sci-3927-predefined-avatars 
Fix avatar localization [SCI-3927]
 2019-10-15 08:57:21 +02:00
Alex Kriuchykhin
50231b3c15
Merge pull request #2158 from okriuchykhin/ok_SCI_3991 
Improve permission checking for reports [SCI-3991]
 2019-10-14 15:14:10 +02:00
Oleksii Kriuchykhin
f3a6c18a84 Improve permission checking for reports [SCI-3991] 2019-10-14 14:50:05 +02:00
aignatov-bio
198697ff23 Fix avatar localization 2019-10-11 12:22:09 +02:00
aignatov-bio
5506d31d71
Merge pull request #2114 from aignatov-bio/ai-sci-3927-predefined-avatars 
Add predefined avatars [SCI-3927]
 2019-10-11 11:54:28 +02:00
aignatov-bio
54627faeb3 Fix tests 2019-10-11 11:46:51 +02:00
aignatov-bio
521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
aignatov-bio
1f43f35073 First modal 2019-10-11 11:46:51 +02:00
Oleksii Kriuchykhin
8f52b362d6 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-11 11:46:51 +02:00
Miha Mencin
0aeeef85dc
Update version to 1.17.2 2019-10-10 16:41:57 +02:00
Alex Kriuchykhin
f6da6814b8
Merge pull request #2154 from okriuchykhin/ok_SCI_3977 
Generate previews for newly created office files once asset is saved [SCI-3977]
 2019-10-10 15:43:02 +02:00
Oleksii Kriuchykhin
07b037f05b Generate previews for newly created office files once asset is saved [SCI-3977] 2019-10-10 15:40:50 +02:00