Mojca Lorber
|
46e7de0c25
|
Add new button style
|
2019-12-18 09:57:39 +01:00 |
|
Miha Mencin
|
8d22bf6f2e
|
Version bump to 1.17.9
|
2019-12-17 14:54:48 +01:00 |
|
Miha Mencin
|
1cf6d35e57
|
Merge pull request #2268 from biosistemika/release/1.17.9
Release/1.17.9
|
2019-12-17 14:53:06 +01:00 |
|
Miha Mencin
|
b67911c81a
|
Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9
|
2019-12-17 14:48:50 +01:00 |
|
Oleksii Kriuchykhin
|
dc8ff18d68
|
Fix issue with clone & move task to another experiment [SCI-4145]
|
2019-12-17 11:54:34 +01:00 |
|
Oleksii Kriuchykhin
|
403a3e0140
|
Restrict files to only images in RTE fields [SCI-4146]
|
2019-12-16 16:05:40 +01:00 |
|
aignatov-bio
|
2da7eeaedd
|
Merge pull request #2260 from aignatov-bio/ai-sci-4121-add-edit-mode-to-checklist
Add checklist and list edit mode [SCI-4121]
|
2019-12-13 09:23:14 +01:00 |
|
Alex Kriuchykhin
|
792e6f2eb9
|
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
|
2019-12-12 16:12:40 +01:00 |
|
Oleksii Kriuchykhin
|
0094528a02
|
Improve connected accounts unlinking [SCI-4142]
|
2019-12-12 14:57:27 +01:00 |
|
Alex Kriuchykhin
|
91174437ee
|
Merge pull request #2261 from biosistemika/dependabot/bundler/puma-4.3.1
Bump puma from 4.1.1 to 4.3.1
|
2019-12-12 14:10:41 +01:00 |
|
dependabot[bot]
|
3940f4ccf8
|
Bump puma from 4.1.1 to 4.3.1
Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.3.1)
Signed-off-by: dependabot[bot] <support@github.com>
|
2019-12-12 12:09:51 +00:00 |
|
Alex Kriuchykhin
|
d8c2b70365
|
Merge pull request #2259 from biosistemika/release-1-17-8
Merge release 1.17.8 to develop
|
2019-12-12 13:08:52 +01:00 |
|
aignatov-bio
|
eed56b59aa
|
Fix markup
|
2019-12-11 15:08:18 +01:00 |
|
aignatov-bio
|
52c0782447
|
Fix checklist update
|
2019-12-11 15:05:02 +01:00 |
|
aignatov-bio
|
7664f4be78
|
Add checklist and list edit mode
|
2019-12-11 14:49:14 +01:00 |
|
Oleksii Kriuchykhin
|
07b5ab24c3
|
Switch to chromium-driver for cucumber tests
|
2019-12-11 11:20:58 +01:00 |
|
Oleksii Kriuchykhin
|
1aa334fdaa
|
Merge branch 'develop' into release-1-17-8
|
2019-12-11 10:55:00 +01:00 |
|
Alex Kriuchykhin
|
1953cc28d8
|
Merge pull request #2258 from biosistemika/release-1-17-8
Release 1 17 8
|
2019-12-11 10:33:18 +01:00 |
|
Miha Mencin
|
9914005524
|
Bump version to 1.17.8
|
2019-12-11 09:55:11 +01:00 |
|
Oleksii Kriuchykhin
|
ff4ef818fb
|
Implement SSO with Azure AD [SCI-4142]
|
2019-12-10 17:24:53 +01:00 |
|
aignatov-bio
|
7fc9c0d1e4
|
Adding frontend for checklist edit mode
|
2019-12-10 15:58:59 +01:00 |
|
Urban Rotnik
|
7f859eb9a3
|
Merge pull request #2255 from urbanrotnik/ur-sci-4127-refacotr-update-action-in-repository
Refactor RepositoryRowsController [SCI-4127]
|
2019-12-10 15:13:44 +01:00 |
|
Urban Rotnik
|
14ec728ae7
|
Update param for file deletion
|
2019-12-10 14:29:37 +01:00 |
|
Urban Rotnik
|
d35f7119b7
|
Moved delete action to service
|
2019-12-10 14:29:37 +01:00 |
|
Urban Rotnik
|
5345cf0342
|
Updated date and time comparison
|
2019-12-10 14:29:36 +01:00 |
|
Urban Rotnik
|
5055490a23
|
Refactor asset value methods
|
2019-12-10 14:29:36 +01:00 |
|
Urban Rotnik
|
82b93bf9a4
|
Fix failing tests
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
508a9b4e3e
|
RepositoryRows controller refactor
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
b68aadf506
|
Update params nesting
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
dd9880f030
|
Add CreateRepositoryRowService
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
98b89e9e80
|
Add UpdateRepositoryRowService
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
0c990ef8cf
|
Add functions for creating new cells with values
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
5b710241e1
|
Add delete condition to update_data method on CellValues
|
2019-12-10 14:29:33 +01:00 |
|
Urban Rotnik
|
79a50860b6
|
Add methods update_data, data_changed, formatted for all types off ColumnValues
|
2019-12-10 14:29:29 +01:00 |
|
mlorb
|
55b9a82ff0
|
Merge pull request #2254 from mlorb/ml-sci-4029
Add numeric repository column type [SCI-4029]
|
2019-12-10 14:19:46 +01:00 |
|
Mojca Lorber
|
1c342d1d26
|
structure changes
|
2019-12-10 13:52:55 +01:00 |
|
Mojca Lorber
|
a3a5b21951
|
small fixes
|
2019-12-10 12:02:08 +01:00 |
|
mlorb
|
1122fe2d2f
|
Merge branch 'features/new-column-types' into ml-sci-4029
|
2019-12-10 10:54:41 +01:00 |
|
Urban Rotnik
|
28986ee177
|
Merge pull request #2256 from urbanrotnik/ur-sci-fix-syntax-errors
Fix syntax errors
|
2019-12-10 10:50:06 +01:00 |
|
aignatov-bio
|
4d3968a48a
|
Merge pull request #2249 from aignatov-bio/ai-sci-fix-comment-error
Remove edit initialization from comment view mode
|
2019-12-10 10:36:38 +01:00 |
|
aignatov-bio
|
5ba8e6507e
|
Merge branch 'release-1-17-8' into ai-sci-fix-comment-error
|
2019-12-10 10:36:30 +01:00 |
|
Alex Kriuchykhin
|
2e15548680
|
Merge pull request #2245 from okriuchykhin/ok_SCI_4107
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-10 10:35:09 +01:00 |
|
Urban Rotnik
|
c6a3c41019
|
Fix routes in dropdown
|
2019-12-10 10:13:41 +01:00 |
|
Urban Rotnik
|
e764e856d8
|
Fix syntax error
|
2019-12-10 09:40:40 +01:00 |
|
Mojca Lorber
|
8503dd7007
|
Add numeric repository column type
|
2019-12-09 16:38:21 +01:00 |
|
Alex Kriuchykhin
|
7a97f813b2
|
Merge pull request #2252 from biosistemika/SCI-4109-export-with-assigned-item-bugfix
SCI-4109 fix the file copying
|
2019-12-09 16:04:43 +01:00 |
|
aignatov-bio
|
c05991be94
|
Merge pull request #2253 from aignatov-bio/ai-sci-4144-fix-autosave-for-chemical-drawings
Fix autosave for marvinJS in tinyMCE [SCI-4144]
|
2019-12-09 16:03:56 +01:00 |
|
aignatov-bio
|
2a38928b7a
|
Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms
Update drop-down for columns type selection [SCI-4068]
|
2019-12-09 14:09:21 +01:00 |
|
aignatov-bio
|
5da9f1ab34
|
Merge pull request #2250 from aignatov-bio/ai-sci-4011-new-column-type-checklist
Add checklists column type [SCI-4011]
|
2019-12-09 14:06:59 +01:00 |
|
aignatov-bio
|
09079fbcda
|
Fix naming and tests
|
2019-12-09 13:48:36 +01:00 |
|