Alex Kriuchykhin
|
1802d7cb59
|
Merge pull request #2516 from okriuchykhin/ok_SCI_4525
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-23 13:18:23 +02:00 |
|
Oleksii Kriuchykhin
|
06b6907d13
|
Handle situation when task creator or modifier is not present [SCI-4503]
|
2020-04-23 12:40:27 +02:00 |
|
Oleksii Kriuchykhin
|
943285d4a0
|
Fix Azure AD user creation on sign in [SCI-4544]
|
2020-04-22 16:47:06 +02:00 |
|
Oleksii Kriuchykhin
|
608ee23ec4
|
Add task details popover [SCI-4503]
|
2020-04-21 15:11:57 +02:00 |
|
Oleksii Kriuchykhin
|
f811d11c59
|
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-21 14:49:36 +02:00 |
|
Mojca Lorber
|
6fecee8c0c
|
Add protocol options dropdown
|
2020-04-21 10:03:53 +02:00 |
|
aignatov-bio
|
be47efce74
|
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list
Add repositories dropdown list [SCI-4506]
|
2020-04-16 14:17:17 +02:00 |
|
mlorb
|
9584b11d45
|
Merge pull request #2507 from mlorb/ml-sci-4505
Add the user management section of to the Details section of task layout [SCI-4505]
|
2020-04-16 13:47:31 +02:00 |
|
aignatov-bio
|
15b291347b
|
Fix I18n
|
2020-04-14 12:10:17 +02:00 |
|
aignatov-bio
|
fe718349da
|
Add recent protocol tab to load protocal from repository
|
2020-04-09 17:29:39 +02:00 |
|
Mojca Lorber
|
f22f076e6c
|
Add the user management secion of to the Details section of task layout
|
2020-04-08 16:24:59 +02:00 |
|
Oleksii Kriuchykhin
|
a9c3102835
|
Add repository snapshots with service, refactor item assigning [SCI-4516]
|
2020-04-07 18:26:39 +02:00 |
|
Oleksii Kriuchykhin
|
3c53be1f9a
|
Add start date to the task [SCI-4504]
|
2020-03-31 14:17:14 +02:00 |
|
Mojca Lorber
|
bd177f4f2f
|
Renaming fixes
|
2020-03-31 11:22:53 +02:00 |
|
Mojca Lorber
|
7006036626
|
Add new task general layout and add notes section
|
2020-03-30 12:51:35 +02:00 |
|
aignatov-bio
|
b9e81f208d
|
Fix i18n
|
2020-03-27 10:34:06 +01:00 |
|
aignatov-bio
|
8ff4b540e2
|
Update css for login screen
|
2020-03-27 09:43:49 +01:00 |
|
Miha Mencin
|
26b687f2e6
|
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
|
2020-03-10 18:06:23 +01:00 |
|
mlorb
|
bea7a6172b
|
Merge pull request #2456 from mlorb/ml-sci-4412
Remove academy link from navigation and move about modal to support menu [SCI-4412]
|
2020-03-10 17:08:22 +01:00 |
|
Mojca Lorber
|
6bf191d124
|
Remove academy link from navigation and move about modal to support menu
|
2020-03-06 14:36:22 +01:00 |
|
Oleksii Kriuchykhin
|
11a5536af5
|
Improve file upload checks [SCI-4382]
|
2020-03-03 15:26:40 +01:00 |
|
Oleksii Kriuchykhin
|
73623da02c
|
Merge branch 'develop' into features/dashboard
|
2020-02-28 16:46:56 +01:00 |
|
aignatov-bio
|
a28d729aeb
|
Add end point
|
2020-02-24 17:09:10 +01:00 |
|
aignatov-bio
|
5886f2cf90
|
New description to import items modal window
|
2020-02-18 12:13:52 +01:00 |
|
aignatov-bio
|
95c9479f54
|
Add page title
|
2020-02-13 14:54:58 +01:00 |
|
aignatov-bio
|
5c0a769f87
|
General dashboard layout
|
2020-02-13 13:50:29 +01:00 |
|
aignatov-bio
|
d0fd956600
|
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number
Fix error in number column in repository [SCI-4347]
|
2020-02-12 14:16:46 +01:00 |
|
aignatov-bio
|
00531066f8
|
Fix error in number column in repository
|
2020-02-12 11:55:10 +01:00 |
|
aignatov-bio
|
eaf751bad6
|
Improve search input field in the flyouts
|
2020-02-11 15:01:52 +01:00 |
|
Alex Kriuchykhin
|
9c763f2111
|
Merge pull request #2383 from okriuchykhin/ok_SCI_4220
Extend inventory import to support new data types [SCI-4220]
|
2020-02-10 11:04:34 +01:00 |
|
Oleksii Kriuchykhin
|
21bf59b943
|
Add unsaved data notification when navigating away from the inventory [SCI-4301]
|
2020-02-06 16:46:16 +01:00 |
|
Oleksii Kriuchykhin
|
632b54cb98
|
Merge branch 'develop' into ok_SCI_4220
|
2020-02-03 15:50:06 +01:00 |
|
Oleksii Kriuchykhin
|
b0c785f4fb
|
Extend inventory import to support new data types [SCI-4220]
|
2020-02-03 15:20:01 +01:00 |
|
aignatov-bio
|
44eccaaa12
|
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
|
2020-01-30 13:42:07 +01:00 |
|
Urban Rotnik
|
0effb3ee69
|
Add translation for read-only items
|
2020-01-25 08:52:33 +01:00 |
|
aignatov-bio
|
4395a7cc6b
|
Fix small visual bugs
|
2020-01-23 13:12:58 +01:00 |
|
aignatov-bio
|
01cce84314
|
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown
Update delimiter dropdown for manage column modal [SCI-4195]
|
2020-01-20 15:22:40 +01:00 |
|
aignatov-bio
|
cd471bfb25
|
Update delimiter dropdown for manage column modal
|
2020-01-20 14:26:17 +01:00 |
|
Urban Rotnik
|
2ecbd8f8c4
|
Update tooltip
|
2020-01-17 17:50:53 +01:00 |
|
Urban Rotnik
|
2e8db12ca5
|
Add error message for status item
|
2020-01-17 11:25:01 +01:00 |
|
Urban Rotnik
|
218316bea2
|
Update error handling for name and text
|
2020-01-16 13:30:05 +01:00 |
|
Urban Rotnik
|
0522b9b0a3
|
Update too many items error showing
Update too many items error showing
|
2020-01-16 11:40:59 +01:00 |
|
aignatov-bio
|
1ff0351a74
|
Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories
|
2020-01-16 11:36:00 +01:00 |
|
aignatov-bio
|
b116c3720c
|
Fix general css issue for repositories
|
2020-01-15 16:46:01 +01:00 |
|
Miha Mencin
|
b23c874f9e
|
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
Sci 4199 selected checklist is lost
|
2020-01-15 15:28:34 +01:00 |
|
Mojca Lorber
|
c234b014cb
|
fix locales
|
2020-01-15 14:18:08 +01:00 |
|
Miha Mencin
|
5bfa5c7939
|
SCI-4199 disabling delimiter, adding warning
|
2020-01-15 13:59:28 +01:00 |
|
Mojca Lorber
|
9176301b7b
|
Refactor manage repository columns, move it from page into modal
|
2020-01-14 11:13:19 +01:00 |
|
aignatov-bio
|
751d34a078
|
Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders
Update placeholders for cells [SCI-4192]
|
2020-01-10 10:50:00 +01:00 |
|
Alex Kriuchykhin
|
d2e12e0683
|
Merge pull request #2265 from okriuchykhin/ok_SCI_4146
Restrict files to only images in RTE fields [SCI-4146]
|
2020-01-10 10:34:00 +01:00 |
|
aignatov-bio
|
13675dd2e7
|
Update placeholders for cells
|
2020-01-09 14:57:37 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
Urban Rotnik
|
181d637ff3
|
Update/refactor JS for handling Dates and Times
|
2019-12-20 14:59:27 +01:00 |
|
Oleksii Kriuchykhin
|
403a3e0140
|
Restrict files to only images in RTE fields [SCI-4146]
|
2019-12-16 16:05:40 +01:00 |
|
Oleksii Kriuchykhin
|
0094528a02
|
Improve connected accounts unlinking [SCI-4142]
|
2019-12-12 14:57:27 +01:00 |
|
Oleksii Kriuchykhin
|
ff4ef818fb
|
Implement SSO with Azure AD [SCI-4142]
|
2019-12-10 17:24:53 +01:00 |
|
Mojca Lorber
|
8503dd7007
|
Add numeric repository column type
|
2019-12-09 16:38:21 +01:00 |
|
aignatov-bio
|
d8676596f1
|
Add checklists column type
|
2019-12-09 13:48:36 +01:00 |
|
Urban Rotnik
|
06d87cb4b6
|
Add I18n to serializers
|
2019-12-06 11:39:10 +01:00 |
|
Urban Rotnik
|
2ec99fa696
|
Add new renderer for File, Status and List
|
2019-12-05 09:19:19 +01:00 |
|
Urban Rotnik
|
65d8d0e35b
|
DateTime HTML and JS simplified
|
2019-11-29 10:19:57 +01:00 |
|
Urban Rotnik
|
5ae29d549e
|
Add manage modal for DateTime values
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
621f7da37b
|
Add fields for StatusItem
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2ce600820
|
Add delimiter column for repository_column
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2b6296cb5
|
Improve update items action, JS and views
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
6fbb99c8d2
|
Add List items partial and JS
|
2019-11-29 10:19:09 +01:00 |
|
Urban Rotnik
|
24acf1f84b
|
Fix edit mode for File and Text
|
2019-11-29 10:19:08 +01:00 |
|
Mojca Lorber
|
467c80da52
|
Update basic modal layout for creating new column types
|
2019-11-29 10:16:47 +01:00 |
|
Oleksii Kriuchykhin
|
f5abb7c767
|
Add connected accounts section to settings [SCI-4106]
|
2019-11-27 23:16:25 +01:00 |
|
Anton Ignatov
|
7117b767f4
|
Fix commnets to PR
|
2019-11-18 13:59:54 +01:00 |
|
Urban Rotnik
|
43e3763ec8
|
Update x, y, experiment unqiue validation
[SCI-3887]
|
2019-11-18 11:11:40 +01:00 |
|
Urban Rotnik
|
060125a1c4
|
Add file size validation
|
2019-11-18 11:11:38 +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
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +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
|
198697ff23
|
Fix avatar localization
|
2019-10-11 12:22:09 +02:00 |
|
aignatov-bio
|
521a367960
|
Add predefined avatars
|
2019-10-11 11:46:51 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Jure Grabnar
|
477e41a96d
|
Refactor I18n strings for tiny_mce
|
2019-09-30 11:34:39 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +02:00 |
|
aignatov-bio
|
07b9091e23
|
Fix html escape in unshared warning (#2048)
|
2019-09-11 16:33:31 +02:00 |
|
aignatov-bio
|
27104a495c
|
Fix styling for unshared warning message (#2044)
|
2019-09-11 11:50:02 +02:00 |
|
Oleksii Kriuchykhin
|
265047caf3
|
Improve behaviour of inventory items export modal [SCI-3815]
|
2019-09-09 10:38:47 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
mlorb
|
ba5bebedb2
|
change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)
|
2019-09-02 10:30:29 +02:00 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +02:00 |
|
aignatov-bio
|
d209b3abcd
|
Update share modal window [SCI-3812] (#2018)
* Update share modal window
* Fix markup
|
2019-08-29 13:45:27 +02:00 |
|
Miha Mencin
|
b850efbceb
|
Code review remarks, added tooltip for unshared inventory
|
2019-08-26 10:45:40 +02:00 |
|
Luka Murn
|
c5c47916d2
|
Change localization key to not be called custom_field
|
2019-08-23 16:06:30 +02:00 |
|
Luka Murn
|
2db39c049e
|
Remove projects archive page
|
2019-08-21 13:10:54 +02:00 |
|
aignatov-bio
|
2cf7f52f15
|
Add inline editing for inventories [SCI-3763] (#1991)
* Add inline editing for inventories
* Remove old locals
* Markup fix
|
2019-08-19 13:30:56 +02:00 |
|
Urban Rotnik
|
ef528ccdc6
|
Fix translation for view only permission
|
2019-08-19 09:51:28 +02:00 |
|
aignatov-bio
|
d4aedbb35f
|
Small ux changes for inventories (#1989)
|
2019-08-19 09:24:10 +02:00 |
|
aignatov-bio
|
737f9e572c
|
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues
* Fix tests
|
2019-08-13 11:04:19 +02:00 |
|
Urban Rotnik
|
7719b825e3
|
Update wording for sharing activities, rename button, add view-only paragraph
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
32783576c1
|
Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
2648521924
|
Invite modal with form
|
2019-08-09 14:15:49 +02:00 |
|
Urban Rotnik
|
466b05a5bc
|
Update repository index page
|
2019-08-09 14:15:48 +02:00 |
|
Mojca Lorber
|
15432ac851
|
Make changes to inventory list in navigation based on new mockup
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
cac7dab440
|
Show shared inventories in left navigation and fix read repository permission
|
2019-08-09 14:13:00 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Jure Grabnar
|
8323bf5b48
|
Add missing system_notifications en.yml
|
2019-08-05 19:05:44 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +02:00 |
|
Jure Grabnar
|
48c6b9ae91
|
Fix typo
Fix SCI-3696
|
2019-07-15 11:30:59 +02:00 |
|
Miha Mencin
|
d4b09444b2
|
Merge pull request #1917 from biosistemika/SCI-3672-replace-button-title
SCI-3672 Replace Talk to us button link
|
2019-07-12 16:18:32 +02:00 |
|
mlorb
|
5bc8eb7392
|
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
|
2019-07-12 15:52:40 +02:00 |
|
Anton Ignatov
|
ba1d6d45ca
|
Fix merging issues
|
2019-07-12 15:47:15 +02:00 |
|
Anton Ignatov
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
aignatov-bio
|
26ef970a1e
|
Add academy button (#1924)
|
2019-07-12 11:15:34 +02:00 |
|
Mojca Lorber
|
f8afc92606
|
Fix page redirect and add success flash msg after protocols.io import action
|
2019-07-11 09:50:39 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
Miha Mencin
|
f8ea51f7d6
|
SCI-3672 change the copy of the import button
|
2019-07-10 14:24:17 +02:00 |
|
aignatov-bio
|
1a75a31647
|
Remove webinar button [SCI-3664] (#1906)
* Remove webinar button
* Remove constants and i18n
|
2019-07-09 14:01:09 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
aignatov-bio
|
0d1ec0d4ed
|
Fix I18n and constants in DOCX report (#1901)
|
2019-07-08 12:51:26 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
Miha Mencin
|
4efb0b5a4a
|
SCI-3645 added descending sorting by name
|
2019-07-02 17:42:55 +02:00 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +02:00 |
|
Anton Ignatov
|
6be227b2d3
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-06-28 10:47:38 +02:00 |
|
Jure Grabnar
|
1ccabf62b3
|
Add preview banner in external protocols
|
2019-06-28 01:38:33 +02:00 |
|
Urban Rotnik
|
2761079479
|
Add modal for import
|
2019-06-27 16:46:02 +02:00 |
|
aignatov-bio
|
83bc9eb22f
|
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
Adding new activities for image editing [SCI-3369]
|
2019-06-24 10:31:39 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Alex Kriuchykhin
|
db7c6435b3
|
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-20 11:31:15 +02:00 |
|
Jure Grabnar
|
d103f8ffec
|
Finish external protocols screen
Closes SCI-3534
|
2019-06-17 12:24:12 +02:00 |
|
Jure Grabnar
|
0b60da9b4c
|
Add ExternalProtocols skeleton tab
|
2019-06-17 12:24:12 +02:00 |
|
Anton Ignatov
|
f480c0eb8d
|
Adding new activtiies for image editing
|
2019-06-14 16:15:30 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Oleksii Kriuchykhin
|
6e1a7a3392
|
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-11 10:08:33 +02:00 |
|
Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
aignatov-bio
|
f1f04adeb2
|
Fix placeholder in protocol description [SCI-3454] (#1769)
* Fix placeholder in protocol description
* Change task tags text
|
2019-05-15 14:13:13 +02:00 |
|
Anton Ignatov
|
8b11cec953
|
Fix wording in en
|
2019-05-14 09:52:41 +02:00 |
|
aignatov-bio
|
fe2a3c4ee6
|
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754)
* Add message when turbolinks change page with dirty tinuMCE
|
2019-05-14 09:49:00 +02:00 |
|
Luka Murn
|
bd9ffe4bd2
|
Refactor WOPI filename length validation onto the model
|
2019-05-13 15:41:39 +02:00 |
|
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 |
|
Anton Ignatov
|
e5b4adcc25
|
Merge branch 'master-with-note-section' into features/marvinjs-integration
|
2019-05-11 20:51:01 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
Luka Murn
|
890df8803e
|
Add file name validation to create new Office file modal window
|
2019-05-10 18:19:32 +02:00 |
|
Anton Ignatov
|
88e67a16c2
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-02 16:16:03 +02:00 |
|
Anton Ignatov
|
fef691d30f
|
Add error handling and secutiry checks
|
2019-05-02 16:12:25 +02:00 |
|
Anton Ignatov
|
4d0d5aa014
|
Adding team sketches selector
|
2019-04-30 17:32:55 +02:00 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
Anton Ignatov
|
7c55fcf0cf
|
Merge branch 'master' into master-with-note-section
|
2019-04-30 12:07:59 +02:00 |
|
Anton Ignatov
|
cf4ff41ec6
|
Add delete feature
|
2019-04-27 13:51:35 +02:00 |
|
aignatov-bio
|
dc7fddc60a
|
Improve task tags (#1708)
|
2019-04-26 15:38:33 +02:00 |
|
Mojca Lorber
|
eac90109f7
|
Change ownership of inventory items, when a user leaves a team
|
2019-04-26 10:47:08 +02:00 |
|
aignatov-bio
|
1a860037f7
|
Update reports for new RTE [SCI-3263] (#1691)
* Update reports for new RTE
|
2019-04-25 16:16:43 +02:00 |
|
Urban Rotnik
|
774521df7a
|
Changes to comments section in Task Steps
|
2019-04-23 15:02:58 +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
|
ea0368aa11
|
Attachments update for edit page
|
2019-04-23 13:50:47 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
f47d0e2932
|
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
Improve the image file upload into RTE input fields [SCI-3131]
|
2019-04-10 14:04:06 +02:00 |
|
Urban Rotnik
|
ee3dc571e1
|
Update attachments view, add ordering on FE
|
2019-04-09 14:17:40 +02:00 |
|
Urban Rotnik
|
a3932cc67f
|
New asset box style update
|
2019-04-09 14:17:40 +02:00 |
|
Jure Grabnar
|
fddff9c627
|
Perform styling on the WOPI modal
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
b12916b828
|
Add main functionality
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
613843d095
|
Temp commit
|
2019-04-04 16:58:55 +02:00 |
|
aignatov-bio
|
08263ab64e
|
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
|
2019-03-28 10:55:48 +01:00 |
|
Urban Rotnik
|
d0a8652969
|
Add message for empty activity list
|
2019-03-28 09:14:01 +01:00 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
Jure Grabnar
|
171b2eeedc
|
Remove the title of protocol steps when empty
Closes SCI-3072
|
2019-03-25 09:36:56 +01:00 |
|
Anton Ignatov
|
55c93922ea
|
markup fixes
|
2019-03-20 14:46:54 +01:00 |
|
Mojca Lorber
|
8f8f4aa250
|
Move and update the activities locales
|
2019-03-20 13:20:35 +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 |
|
Mojca Lorber
|
cd7a87348f
|
Protocol activities refactoring, without tests
|
2019-03-19 16:12:07 +01:00 |
|
Mojca Lorber
|
c476816359
|
Task activities refactoring, without tests
|
2019-03-19 15:33:57 +01:00 |
|
Mojca Lorber
|
7757096693
|
Results activities refactoring
|
2019-03-19 15:33:57 +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 |
|
Urban Rotnik
|
b33e95e18a
|
New Protocols actions logging
|
2019-03-12 09:14:53 +01:00 |
|
Oleksii Kriuchykhin
|
80e525fd97
|
Improve image editor behaviour [SCI-2855]
|
2019-03-11 15:09:49 +01:00 |
|
Oleksii Kriuchykhin
|
89e968c410
|
Add tui.image-editor [SCI-2815]
|
2019-03-11 15:08:15 +01:00 |
|
Oleksii Kriuchykhin
|
e3bacd6b9a
|
Fix global activities page after refactoring [SCI-2994][SCI-3024]
|
2019-03-08 13:09:27 +01:00 |
|
aignatov-bio
|
125d2a3b9b
|
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
|
2019-03-06 09:18:45 +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 |
|
Urban Rotnik
|
3121bf1d39
|
Update tooltip for system notifications dropdown
|
2019-02-27 14:49:18 +01:00 |
|
aignatov-bio
|
aa8a2b040a
|
Merge pull request #1518 from biosistemika/features/system-notifications
Notification changes on settings page [SCI 3084] (#1517)
|
2019-02-22 14:01:38 +01:00 |
|
aignatov-bio
|
606708987f
|
Notification changes on settings page [SCI 3084] (#1517)
* Fix css and update text settings
|
2019-02-22 13:20:51 +01:00 |
|
Miha Mencin
|
bcd0b433b6
|
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-21 16:38:58 +01:00 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
aignatov-bio
|
5fdba554d2
|
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-20 17:22:57 +01:00 |
|
Urban Rotnik
|
8768fcac6c
|
Copy change
|
2019-02-20 14:19:59 +01:00 |
|
aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +01:00 |
|
Urban Rotnik
|
d3d9868ba4
|
Set version for HTTParty dependency, add opts in mailer
|
2019-02-19 11:23:01 +01:00 |
|
Urban Rotnik
|
29d77ca81d
|
Add system_notification sending email feature
|
2019-02-19 11:20:25 +01:00 |
|
aignatov-bio
|
8e905b67b2
|
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
|
2019-02-19 11:08:59 +01:00 |
|
aignatov-bio
|
5c85595ab4
|
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
|
2019-02-13 13:06:14 +01:00 |
|
mlorb
|
8bad68c854
|
Merge pull request #1457 from mlorb/ml-sci-2933
Change experiment cards look and feel [SCI-2933]
|
2019-02-12 11:49:24 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Oleksii Kriuchykhin
|
5b566b48ae
|
Improve error messages and fix task users/items endpoints [SCI-2886]
|
2018-11-28 14:14:45 +01:00 |
|
Jure Grabnar
|
7812f70c2f
|
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
Protocols - import from protocols.io doesn't work
|
2018-11-26 14:56:25 +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
|
87d5e5029a
|
Fix publish_date in PIO import
|
2018-11-23 17:37:26 +01:00 |
|
Luka Murn
|
87ff7c71e3
|
Update the delivery email look & feel
Closes SCI-2884.
|
2018-11-23 17:24:10 +01:00 |
|
Luka Murn
|
af307eae73
|
Move some text into localization file
|
2018-11-23 11:12:10 +01:00 |
|
Alex Kriuchykhin
|
95e19e1229
|
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-22 13:06:13 +01:00 |
|
Oleksii Kriuchykhin
|
d98f11abdc
|
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-20 17:02:45 +01:00 |
|
Oleksii Kriuchykhin
|
5deaf25fd9
|
Prevent user being added to project/task multiple times [SCI-2869]
|
2018-11-20 14:29:33 +01:00 |
|
mlorb
|
3b96a60938
|
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
|
2018-11-19 11:36:08 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +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
|
23ee4760ae
|
Fix failing tests [SCI-2773]
|
2018-11-07 16:39:00 +01:00 |
|
Luka Murn
|
95340bcf36
|
Update team name placeholder & sublabel on sign up pages
|
2018-10-24 13:43:56 +02:00 |
|
Oleksii Kriuchykhin
|
b53f2c8347
|
Improve error messages in API [SCI-2773]
|
2018-10-23 17:52:48 +02:00 |
|
mlorb
|
e5fca1b1cd
|
change the rich text max limit on frontend to 50000
|
2018-10-18 14:22:15 +02:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Jure Grabnar
|
26df1e5a98
|
Add export project modal
Closes [SCI-2645]
|
2018-10-16 11:00:38 +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
|
0ebce8e283
|
Add relative links (not working) to files and tables into the PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
Alex Kriuchykhin
|
16b29b50a5
|
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
Add Projects view - list/table view [SCI-2731]
|
2018-10-08 17:53:35 +02:00 |
|
Luka Murn
|
9e78de6ef2
|
Update CREATE, PATCH, DELETE inventory_column endpoints
|
2018-10-06 17:11:59 +02:00 |
|
Jure Grabnar
|
d7c875135e
|
Merge pull request #1304 from jbargu/jg_zipfile_structure
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
|
2018-10-05 15:36:56 +02:00 |
|
Luka Murn
|
d71be76657
|
Fix minor styling & text on settings - preferences page
|
2018-10-02 13:59:19 +02:00 |
|
Luka Murn
|
a2c2bca200
|
Update localized text in report elements modal
|
2018-10-02 13:51:59 +02:00 |
|
Oleksii Kriuchykhin
|
492a5de19e
|
Add Projects view - list/table view [SCI-2731]
|
2018-10-01 15:39:42 +02:00 |
|
Oleksii Kriuchykhin
|
2508394924
|
Refactor Projects view - cards view [SCI-2730]
|
2018-09-27 10:43:44 +02:00 |
|
Oleksii Kriuchykhin
|
f8388d4bcd
|
Merge branch 'ok_SCI_2729' into ok_SCI_2730
|
2018-09-25 10:26:46 +02:00 |
|
Oleksii Kriuchykhin
|
80e73bfb97
|
Implement Projects view - navigation bar (tabs) [SCI-2729]
|
2018-09-24 16:25:04 +02:00 |
|
Luka Murn
|
63b4f7d909
|
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
|
2018-09-24 16:23:53 +02:00 |
|
Jure Grabnar
|
7877d559a3
|
Update email/notification, type: deliver
Closes [SCI-2643], [SCI-2644].
|
2018-09-23 18:45:13 +02:00 |
|
Oleksii Kriuchykhin
|
84428b37c2
|
Add project view JSON endpoints [SCI-2728]
|
2018-09-21 10:39:20 +02:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Zanz2
|
e9e7fa08b0
|
new tooltip texts, provided by Tea
|
2018-09-05 08:42:00 +02:00 |
|
Zanz2
|
1bed2c2a3c
|
Partially fixed according to pull request review, added comments to code review
|
2018-08-31 12:11:51 +02:00 |
|
Zanz2
|
beb1d02914
|
Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always
|
2018-08-20 15:57:09 +02:00 |
|
Zanz2
|
8c492e1491
|
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
|
2018-08-17 16:03:49 +02:00 |
|
Zanz2
|
637c7dfb19
|
modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic
|
2018-08-17 11:33:44 +02:00 |
|
Zanz2
|
d2373980d4
|
Testing out new popover
|
2018-08-16 15:07:59 +02:00 |
|
Oleksii Kriuchykhin
|
8d11e03d47
|
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
|
2018-08-08 17:01:49 +02:00 |
|
zmagod
|
5b9b86a2d4
|
fixes per @Ducz0r 's request
|
2018-07-04 15:23:41 +02:00 |
|
zmagod
|
c9dd8b356a
|
fixes locale, fixes custom file upload style
|
2018-07-04 13:43:45 +02:00 |
|
zmagod
|
6a6ff534c0
|
fixes import flash message [fixes SCI-2398]
|
2018-06-15 11:12:11 +02:00 |
|
Zmago Devetak
|
29fe58de80
|
Merge pull request #1208 from ZmagoD/zd_SCI_2408
adds an additional check if some other user has added/removed reposit…
|
2018-06-13 11:30:43 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
zmagod
|
f8ac083d39
|
adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]
|
2018-06-12 15:28:03 +02:00 |
|
Zmago Devetak
|
6ba5c587f7
|
Merge pull request #1189 from ZmagoD/zd_SCI_2211
add data-hook, refactor add user to project modal to support addons
|
2018-06-08 15:23:26 +02:00 |
|
Zmago Devetak
|
2d3738fc70
|
Merge pull request #1198 from ZmagoD/zd_SCI_2456
fixes label in save report to inventory item modal [fixes SCI-2456]
|
2018-06-08 15:08:53 +02:00 |
|
zmagod
|
d78c130a47
|
fixes label in save report to inventory item modal [fixes SCI-2456]
|
2018-06-08 11:26:33 +02:00 |
|
zmagod
|
11ebea573a
|
fixes project validation message [fixes SCI-2481]
|
2018-06-07 16:42:11 +02:00 |
|
Luka Murn
|
c07fa5adc2
|
Update blank page for projects
|
2018-06-06 17:23:22 +02:00 |
|
Luka Murn
|
ff485cb75d
|
Update wording on 'save protocol to protocol repository' modal
|
2018-06-06 16:38:04 +02:00 |
|
Luka Murn
|
e0a3b5a941
|
Fix Save PDF to repository modal window
|
2018-06-06 16:29:07 +02:00 |
|
Luka Murn
|
b6c4f724db
|
Update text when no experiments are found for moving tasks
|
2018-06-06 16:10:55 +02:00 |
|
zmagod
|
84170f6de0
|
add data-hook, refactor add user to project modal to support addons
|
2018-06-01 16:13:22 +02:00 |
|
zmagod
|
9abf50e7c5
|
Limits the max. amount of rows when importing into inventories [fixes SCI-2468]
|
2018-05-31 10:45:31 +02:00 |
|
zmagod
|
89046e9787
|
fixes items assign flash message [fixes SCI-2395]
|
2018-05-29 12:54:41 +02:00 |
|
mlorb
|
2bce62cab8
|
Merge branch 'ux-release-1' into ml-sci-2405
|
2018-05-28 11:43:14 +02:00 |
|
mlorb
|
58ba596a24
|
update locales
|
2018-05-28 09:38:24 +02:00 |
|
zmagod
|
bcebc03416
|
adds missing locales
|
2018-05-28 09:17:29 +02:00 |
|
mlorb
|
f02363dfce
|
fix error if user is not assigned to any teams
|
2018-05-25 17:14:22 +02:00 |
|
mlorb
|
f972676f8d
|
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix
Update software with new logo & new brand [SCI-2416]
|
2018-05-23 15:47:17 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
Luka Murn
|
dac44acf2a
|
Rename sciNote -> SciNote (config/ folder)
|
2018-05-21 15:11:12 +02:00 |
|
mlorb
|
0fccc71fc3
|
fix load protocol wording and UI-style
|
2018-05-18 16:57:18 +02:00 |
|
mlorb
|
64cbddb9a0
|
UI/UX restyle - update colours for navigation
|
2018-05-18 10:41:32 +02:00 |
|
zmagod
|
cf4c33bf92
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
|
2018-05-17 15:22:43 +02:00 |
|
zmagod
|
e019767e90
|
refactor save_pdf_to_inventory_item service
|
2018-05-17 13:17:19 +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 |
|
mlorb
|
06ce285ae2
|
add locales
|
2018-05-16 14:32:15 +02:00 |
|
Zmago Devetak
|
9d2303c777
|
Merge pull request #1115 from ZmagoD/zd_SCI_2321
fixes images preview in repository/library [fixes SCI-2321]
|
2018-05-16 12:05:33 +02:00 |
|
zmagod
|
712a3c7ff6
|
fixes css, changes spinner in preview modal
|
2018-05-16 10:40:49 +02:00 |
|
zmagod
|
4573655ec8
|
adds save PDF report to inventory feature [fixes SCI-2371]
|
2018-05-16 09:31:19 +02:00 |
|
mlorb
|
cea7f5a3f7
|
some extra style unification
|
2018-05-15 17:10:31 +02:00 |
|
mlorb
|
dfe65ccaed
|
UI/UX restyle - fixes throughout application - part 2
|
2018-05-14 18:33:57 +02:00 |
|
mlorb
|
b5649f0574
|
Merge branch 'ux-release-1' into ml-sci-2336-v1
|
2018-05-10 13:59:57 +02:00 |
|
Zmago Devetak
|
0a4deeaa35
|
Merge pull request #1112 from ZmagoD/zd_SCI_2261
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-05-10 09:57:49 +02:00 |
|
mlorb
|
7df40e56c7
|
UI/UX restyle - fixes throughout application part one
|
2018-05-08 16:33:42 +02:00 |
|
mlorb
|
ca022fead7
|
rename inventories buttons
|
2018-05-03 10:39:50 +02:00 |
|
mlorb
|
f97477f3f0
|
some extra button styling
|
2018-04-26 15:19:05 +02:00 |
|
mlorb
|
763d934aa7
|
fix buttons again
|
2018-04-26 15:02:24 +02:00 |
|
zmagod
|
8dac887f10
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261
|
2018-04-26 14:18:41 +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 |
|
zmagod
|
824962c084
|
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-04-23 11:33:16 +02:00 |
|
zmagod
|
e96b690a5b
|
removes reports link from secondary navigation, fix bug with turbolinks
|
2018-04-20 11:57:52 +02:00 |
|
zmagod
|
dafa29d4bf
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124
|
2018-04-20 10:33:15 +02:00 |
|
mlorb
|
3249d5db0d
|
Merge pull request #1100 from mlorb/ml-sci-2303
Update reports show page to work with new navigation [SCI-2303]
|
2018-04-20 09:50:35 +02:00 |
|
Zmago Devetak
|
93fc1af12d
|
Merge pull request #1083 from ZmagoD/zd_SCI_2259
set limit on maximum number of dropdown list items [fixes SCI-2259]
|
2018-04-19 17:17:54 +02:00 |
|
Zmago Devetak
|
1290435372
|
Merge pull request #1086 from ZmagoD/zd_SCI_2207
enables copying of repository items [fixes SCI-2207]
|
2018-04-19 17:13:43 +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 |
|
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
|
ce52eb851b
|
add validation to dropdown items
|
2018-04-19 14:02:42 +02:00 |
|
zmagod
|
66cc76f640
|
add view label in locales
|
2018-04-19 12:49:32 +02:00 |
|
zmagod
|
9d282d1800
|
adds new reports index page [fixes SCI-2124]
|
2018-04-18 16:47:52 +02:00 |
|
mlorb
|
cc34376253
|
update reports show page to work with new navigation
|
2018-04-18 14:40:53 +02:00 |
|
mlorb
|
c08d72be36
|
remove breadcrumbs throughout application
|
2018-04-17 17:00:04 +02:00 |
|
zmagod
|
bef166ff30
|
hides the create new inventory button for non admin users [fixes SCI-2296]
|
2018-04-13 13:39:58 +02:00 |
|
Zmago Devetak
|
d466fdf8e8
|
Merge pull request #1089 from ZmagoD/zd_SCI_2292
remove unneeded label in destroy repository record modal [fixes SCI-2…
|
2018-04-12 16:58:28 +02:00 |
|
Zmago Devetak
|
09e5579f0f
|
Merge pull request #1087 from ZmagoD/zd_SCI_2240
rename Repository/Library => Inventory [fixes SCI-2240]
|
2018-04-12 16:58:08 +02:00 |
|
Zmago Devetak
|
9d58292dcf
|
fix
|
2018-04-12 16:44:38 +02:00 |
|
Zmago Devetak
|
f83390e5ad
|
fix
|
2018-04-12 16:20:05 +02:00 |
|
zmagod
|
d084998906
|
remove unneeded label in destroy repository record modal [fixes SCI-2292]
|
2018-04-12 15:00:41 +02:00 |
|
zmagod
|
309bd04e61
|
rename Repository/Library => Inventory [fixes SCI-2240]
|
2018-04-12 14:11:26 +02:00 |
|
Luka Murn
|
9bf8b5d864
|
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
|
2018-04-12 13:16:46 +02:00 |
|
zmagod
|
6291857bbf
|
enables copying of repository items [fixes SCI-2207]
|
2018-04-11 17:17:19 +02:00 |
|
mlorb
|
a10f671184
|
Merge pull request #1081 from mlorb/ml-sci-2123
Refactor settings into the new navigation bar [SCI-2123]
|
2018-04-09 13:21:16 +02:00 |
|
zmagod
|
b12f6f1b92
|
set limit on maximum number of dropdown list items [fixes SCI-2259]
|
2018-04-09 12:50:25 +02:00 |
|
mlorb
|
8a35ce5c58
|
add locales
|
2018-04-09 10:53:03 +02:00 |
|
mlorb
|
0c851f227c
|
remove unused locals
|
2018-04-06 15:00:19 +02:00 |
|
mlorb
|
b8e91e91a1
|
refactor settings into the new navigation bar
|
2018-04-05 16:30:02 +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
|
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
|
ab48e4f527
|
Merge pull request #1072 from ZmagoD/zd_SCI_2239
change export model wording [fixes SCI-2239]
|
2018-04-04 15:40:18 +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 |
|
zmagod
|
77f80271dd
|
fixes per @mojca 's request
|
2018-04-04 14:52:59 +02:00 |
|
Oleksii Kriuchykhin
|
3b7977ee3b
|
Merge latest changes from ux-release-1 [SCI-2217]
|
2018-04-04 14:20:34 +02:00 |
|
zmagod
|
5eb007f4d2
|
fixes per @mlorb 's request
|
2018-04-04 13:22:14 +02:00 |
|
zmagod
|
38b84edfb0
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
|
2018-04-04 12:59:41 +02:00 |
|
zmagod
|
e630d3113f
|
add ID column to repository [fixes SCI-2206]
|
2018-04-04 11:55:11 +02:00 |
|
zmagod
|
3d5137b56f
|
change export model wording [fixes SCI-2239]
|
2018-04-03 11:22:23 +02:00 |
|
Oleksii Kriuchykhin
|
f656ad1561
|
Fix fa icons [SCI-2217]
|
2018-03-30 17:03:44 +02:00 |
|
Zmago Devetak
|
f5f6fa4a4f
|
Merge pull request #1066 from ZmagoD/zd_SCI_2235
updated repository import modal html [fixes SCI-2235]
|
2018-03-30 14:32:53 +02:00 |
|
okriuchykhin
|
a6d45fea0a
|
Merge pull request #1059 from okriuchykhin/ok_SCI_2205
Add repository name to record info modal [SCI-2205]
|
2018-03-30 14:02:53 +02:00 |
|
Oleksii Kriuchykhin
|
cc855cda86
|
Fix translations [SCI-2205]
|
2018-03-30 12:48:34 +02:00 |
|
okriuchykhin
|
5e0cf58bc5
|
Merge pull request #1058 from okriuchykhin/ok_SCI_2111
Implement search in file repository cells and improve performance [SCI-2111]
|
2018-03-30 12:39:47 +02:00 |
|
Oleksii Kriuchykhin
|
cc5d8550b1
|
Refactor file preview modal [SCI-2217]
|
2018-03-30 11:50:28 +02:00 |
|
zmagod
|
802e917e69
|
updated repository import modal html [fixes SCI-2235]
|
2018-03-30 09:47:27 +02:00 |
|
zmagod
|
fd88104fe2
|
adds manage repository link in repository actions dropdown
|
2018-03-29 17:10:57 +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 |
|
Oleksii Kriuchykhin
|
fac5875cfd
|
Add repository name to record info modal [SCI-2205]
|
2018-03-26 16:18:09 +02:00 |
|
Oleksii Kriuchykhin
|
e42fc3117b
|
Implement search in file repository cells and improve performance [SCI-2111]
|
2018-03-26 13:19:09 +02:00 |
|
zmagod
|
8f09e1f7a4
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
|
2018-03-26 13:08:31 +02:00 |
|
mlorb
|
b7a14215bc
|
Merge pull request #1050 from mlorb/ml-sci-2120-v2
Refactor project navigation [SCI-2120]
|
2018-03-26 12:56:19 +02:00 |
|
zmagod
|
3efe06a410
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
|
2018-03-26 12:02:24 +02:00 |
|
zmagod
|
9e1f285c9e
|
adds missing labels [fixes SCI-2219]
|
2018-03-26 11:28:14 +02:00 |
|
mlorb
|
1797afa718
|
Merge branch 'ux-release-1' into ml-sci-2238
|
2018-03-26 10:44:43 +02:00 |
|
mlorb
|
70e0d8bd1d
|
Merge pull request #1052 from mlorb/ml-sci-2125
Implement new Help dropup in navigation [SCI-2125]
|
2018-03-26 09:22:39 +02:00 |
|
mlorb
|
83741358d1
|
fix locales
|
2018-03-23 16:19:06 +01:00 |
|
zmagod
|
baf69461f5
|
adds edit/create modal and related actions
|
2018-03-23 16:00:33 +01:00 |
|