mlorb
|
7ad3527338
|
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes
Visual fixes [SCI-4274]
|
2020-02-03 09:44:48 +01:00 |
|
Mojca Lorber
|
e70bc67146
|
Implement missing style guide changes
|
2020-01-31 14:11:37 +01:00 |
|
mlorb
|
0ef066f921
|
Merge pull request #2365 from mlorb/ml-sci-4252
Fix checklist list in inventory table [SCI-4252]
|
2020-01-30 13:44:02 +01:00 |
|
aignatov-bio
|
9a9088a0da
|
Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task
Fix duplicate tags and small css issues [SCI-4279]
|
2020-01-30 13:42:22 +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 |
|
mlorb
|
bfd928b8fc
|
Merge pull request #2373 from mlorb/ml-sci-4293
Fix buttons style [SCI-4293]
|
2020-01-30 13:40:37 +01:00 |
|
mlorb
|
a2afa11fef
|
Merge pull request #2378 from mlorb/ml-sci-4311
Fix scroll position on protocol and result page [SCI-4311]
|
2020-01-30 13:39:16 +01:00 |
|
Urban Rotnik
|
7813d3ab75
|
Merge pull request #2363 from urbanrotnik/ur-sci-4190
Make less opacity when editing or adding row [SCI-4190]
|
2020-01-30 13:24:20 +01:00 |
|
Urban Rotnik
|
64a7657f19
|
Merge pull request #2364 from urbanrotnik/ur-sci-4219
Fix too long line problem[SCI-4219]
|
2020-01-30 13:07:01 +01:00 |
|
aignatov-bio
|
2c595d01fc
|
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters
Small fixes
|
2020-01-29 15:48:19 +01:00 |
|
Urban Rotnik
|
db6f1ecebb
|
Set fixed width for preview dropdown
|
2020-01-29 15:11:42 +01:00 |
|
Mojca Lorber
|
9388883479
|
Fix scroll position on protocol and result page
|
2020-01-29 14:28:52 +01:00 |
|
Urban Rotnik
|
875515121b
|
Fix Share button in repositories
|
2020-01-29 14:15:47 +01:00 |
|
aignatov-bio
|
970463f34d
|
Fix input fields
|
2020-01-29 11:41:47 +01:00 |
|
aignatov-bio
|
4aa0a79c02
|
Fix resize repository
|
2020-01-29 11:00:48 +01:00 |
|
Miha Mencin
|
94cce6d57e
|
Revert "Fix repository data time range column width [SCI-4306]"
|
2020-01-28 16:25:21 +01:00 |
|
Mojca Lorber
|
f502408e07
|
Fix buttons style
|
2020-01-28 15:30:57 +01:00 |
|
Mojca Lorber
|
1a834c206b
|
Fix repository data time range column width
|
2020-01-28 15:12:09 +01:00 |
|
aignatov-bio
|
0ce52aae94
|
Add container for repository filters
|
2020-01-28 14:11:11 +01:00 |
|
Mojca Lorber
|
b938c6ce35
|
Fix css for icons for repository file type
|
2020-01-28 11:32:48 +01:00 |
|
Urban Rotnik
|
6c50b514f3
|
Put Academy icon back, resize team switch
|
2020-01-27 17:15:22 +01:00 |
|
Urban Rotnik
|
83f4344bb7
|
Merge pull request #2366 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-27 16:35:07 +01:00 |
|
Mojca Lorber
|
e6043ee0e5
|
Fix checklist list in inventory table
|
2020-01-27 15:52:52 +01:00 |
|
Urban Rotnik
|
dc79174160
|
Make less opacity when editing or adding row
|
2020-01-27 14:39:45 +01:00 |
|
mlorb
|
f605c0def3
|
Merge pull request #2358 from mlorb/ml-sci-4275
Change to new style checkboxes on share inventory modal [SCI-4275]
|
2020-01-27 13:38:30 +01:00 |
|
Mojca Lorber
|
276df8c151
|
Fix Safari inventories bug
|
2020-01-27 10:20:49 +01:00 |
|
Urban Rotnik
|
d7761622ba
|
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-25 12:36:36 +01:00 |
|
Urban Rotnik
|
ec8af5f943
|
Add readonly repository rows records
|
2020-01-24 16:33:44 +01:00 |
|
Mojca Lorber
|
3af2f4af19
|
Change to new style checkboxes on share inventory modal
|
2020-01-24 15:43:13 +01:00 |
|
Mojca Lorber
|
f5d245e7cc
|
Sidebar redesign
|
2020-01-24 13:22:04 +01:00 |
|
aignatov-bio
|
24b296fd86
|
Fix duplicate tags and small css issues
|
2020-01-23 13:38:02 +01:00 |
|
aignatov-bio
|
4395a7cc6b
|
Fix small visual bugs
|
2020-01-23 13:12:58 +01:00 |
|
Mojca Lorber
|
658b64b617
|
Change button
|
2020-01-21 17:21:49 +01:00 |
|
aignatov-bio
|
79d71f1e9b
|
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
|
2020-01-21 16:33:05 +01:00 |
|
aignatov-bio
|
5a4d74d487
|
Update emoji picker image loading
|
2020-01-21 15:49:13 +01:00 |
|
Mojca Lorber
|
981f8678df
|
Fix alerts style
|
2020-01-21 15:21:40 +01:00 |
|
aignatov-bio
|
bf9c7a70d4
|
Improve event handling
|
2020-01-21 14:01:44 +01:00 |
|
aignatov-bio
|
6a67280f6a
|
Add new emoji picker
|
2020-01-21 10:50:55 +01:00 |
|
Urban Rotnik
|
ed77d95abd
|
Merge pull request #2343 from urbanrotnik/ur-sci-4262-disable-columns-editing-on-task-page
Hide new column button in modal [SCI-4262]
|
2020-01-21 09:25:21 +01:00 |
|
Miha Mencin
|
96ed19ab22
|
Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding
Fix small css issues [SCI-4269]
|
2020-01-21 09:22:56 +01:00 |
|
Urban Rotnik
|
42df748f87
|
Hide new column button in modal
|
2020-01-21 08:37:02 +01:00 |
|
aignatov-bio
|
e022f7a096
|
Fix small css issues
|
2020-01-20 15:48:51 +01:00 |
|
Miha Mencin
|
239abfee33
|
Merge pull request #2340 from biosistemika/SCI-4218-remove-tooltips
SCI-4218 prevent displaying tooltip on column type selection
|
2020-01-20 15:25:28 +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 |
|
Miha Mencin
|
ed7d275d9a
|
SCI-4218 prevent displaying tooltip on column type selection
|
2020-01-20 14:42:16 +01:00 |
|
aignatov-bio
|
cd471bfb25
|
Update delimiter dropdown for manage column modal
|
2020-01-20 14:26:17 +01:00 |
|
Urban Rotnik
|
fc29641c2b
|
Hide manage column action buttons on Task page
|
2020-01-17 17:29:26 +01:00 |
|
aignatov-bio
|
e4e2e08456
|
Merge pull request #2325 from aignatov-bio/ai-sci-4239-2-fix-smartannotation-position
Fix smart annotation position [SCI-4239]
|
2020-01-17 14:39:54 +01:00 |
|
Miha Mencin
|
58db10ce7f
|
Merge pull request #2331 from urbanrotnik/ur-sci-4240-status-items-error-message
Add error message for status item [SCI-4240]
|
2020-01-17 14:07:42 +01:00 |
|
Miha Mencin
|
61ead41271
|
Merge pull request #2332 from urbanrotnik/ur-sci-4193-item-error-handling
item error handling [SCI-4193] FIX
|
2020-01-17 14:07:19 +01:00 |
|
aignatov-bio
|
597c88cacc
|
Fix smart annotation position
|
2020-01-17 13:55:43 +01:00 |
|
Urban Rotnik
|
6bf08a9f3d
|
Update counter visability
|
2020-01-17 11:59:46 +01:00 |
|
Urban Rotnik
|
2e8db12ca5
|
Add error message for status item
|
2020-01-17 11:25:01 +01:00 |
|
Mojca Lorber
|
8b635ac38a
|
Refactor flash alerts
|
2020-01-17 10:49:41 +01:00 |
|
Mojca Lorber
|
36ecfbf7bf
|
Redesign flash alerts
|
2020-01-16 19:08:14 +01:00 |
|
Alex Kriuchykhin
|
4a96fa2648
|
Merge pull request #2323 from aignatov-bio/ai-sci-4255-disable-column-manage-button-in-edit-mode
Disable column manage button in edit mode [SCI-4255]
|
2020-01-16 16:37:29 +01:00 |
|
Urban Rotnik
|
7655dd0bea
|
Merge pull request #2321 from urbanrotnik/ur-sci-4257
Remove Checklist item min length validation and modal fixes [SCI-4257]
|
2020-01-16 16:02:30 +01:00 |
|
aignatov-bio
|
b7fe8b71c1
|
Disable column manage button in edit mode
|
2020-01-16 15:59:57 +01:00 |
|
Urban Rotnik
|
469714c40d
|
Remove Checklist item min length validation and modal fixes
|
2020-01-16 15:21:01 +01:00 |
|
Mojca Lorber
|
a342e3d31f
|
Add emojionearea for status column type
|
2020-01-16 14:58:59 +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
|
509451daae
|
Fix table header size
|
2020-01-16 11:26:23 +01:00 |
|
aignatov-bio
|
cafc10f569
|
Fix datetime picker
|
2020-01-16 11:10:51 +01:00 |
|
Miha Mencin
|
ac4154bd85
|
SCI-4210 fix css
|
2020-01-15 17:09:13 +01:00 |
|
aignatov-bio
|
b116c3720c
|
Fix general css issue for repositories
|
2020-01-15 16:46:01 +01:00 |
|
mlorb
|
e44903bae5
|
Merge branch 'develop' into ml-sci-4150-v2
|
2020-01-15 14:47:25 +01:00 |
|
aignatov-bio
|
778264713f
|
Fix pagination and update css
|
2020-01-15 13:55:11 +01:00 |
|
aignatov-bio
|
271d6db792
|
Merge pull request #2303 from aignatov-bio/ai-sci-4175-update-design-date-time-fields
Update css and error handling for date and time fields [SCI-4175]
|
2020-01-15 12:36:12 +01:00 |
|
Urban Rotnik
|
6d55b07fdc
|
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors
|
2020-01-15 09:10:43 +01:00 |
|
Mojca Lorber
|
16226640d5
|
changes upon Antons review
|
2020-01-14 16:46:48 +01:00 |
|
aignatov-bio
|
7ea6dbc67b
|
Update css and error handling for date and time fields
|
2020-01-14 16:31:55 +01:00 |
|
Urban Rotnik
|
75c7cb7aa8
|
Keep circles for task page
|
2020-01-14 13:31:44 +01:00 |
|
aignatov-bio
|
79b020b97e
|
Update table header color and update checkboxes
|
2020-01-14 11:39:15 +01:00 |
|
Mojca Lorber
|
9176301b7b
|
Refactor manage repository columns, move it from page into modal
|
2020-01-14 11:13:19 +01:00 |
|
Urban Rotnik
|
1cf793127a
|
Update cell color
|
2020-01-14 09:24:42 +01:00 |
|
Urban Rotnik
|
2468b67de0
|
Assign column update
|
2020-01-14 09:02:30 +01:00 |
|
aignatov-bio
|
b37d8f1275
|
Update layout for repository
|
2020-01-13 14:46:43 +01:00 |
|
aignatov-bio
|
38eaf19dde
|
Prevent editing 2 items
|
2020-01-09 15:19:04 +01:00 |
|
aignatov-bio
|
54c78cf4d1
|
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
|
2020-01-08 12:30:51 +01:00 |
|
aignatov-bio
|
5953c2543d
|
Fix typo and boostrap load order
|
2020-01-08 12:07:33 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
aignatov-bio
|
f717ce66cb
|
Fix tests
|
2020-01-06 12:31:56 +01:00 |
|
aignatov-bio
|
464d03558a
|
Fix markup, replace buttons and add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
e714787c38
|
Fix markup
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
18a8be43f5
|
Add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
d93095b489
|
Fix markup
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
a281f09e7f
|
Add reports and missed modals
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
aba3baf685
|
Fix colors
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
3f38b1e6a1
|
Add text input fields
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
443ab8645f
|
Add toggles
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
7bfefd8659
|
Add checkboxes and radio buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
9694117635
|
Add new colors and buttons
|
2020-01-06 10:40:20 +01:00 |
|
Urban Rotnik
|
181d637ff3
|
Update/refactor JS for handling Dates and Times
|
2019-12-20 14:59:27 +01:00 |
|
Mojca Lorber
|
46e7de0c25
|
Add new button style
|
2019-12-18 09:57:39 +01:00 |
|
aignatov-bio
|
7664f4be78
|
Add checklist and list edit mode
|
2019-12-11 14:49:14 +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 |
|
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
|
d8676596f1
|
Add checklists column type
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
eb708e4226
|
Update dropdown for column type selection
|
2019-12-06 16:14:16 +01:00 |
|
Urban Rotnik
|
ee5c2ac93d
|
Add edit renderer for Assets
|
2019-12-04 14:52:52 +01:00 |
|
Urban Rotnik
|
3ab1967703
|
Add Edit renderer for Statuses
|
2019-12-02 11:03:05 +01:00 |
|
Urban Rotnik
|
5ae29d549e
|
Add manage modal for DateTime values
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
1c9d7ef6e7
|
Add File type renderer
|
2019-11-29 10:19:54 +01:00 |
|
Urban Rotnik
|
253205dcd1
|
Syntax improvements
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
85153a5785
|
Split css file
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
9bf948c3a8
|
Add statuses validation on FE
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
b9d50263c4
|
Add simple emoji picker
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
621f7da37b
|
Add fields for StatusItem
|
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 |
|
Oleksii Kriuchykhin
|
338b710d81
|
Refactor inventory edit mode [SCI-4070]
|
2019-11-29 10:19:05 +01:00 |
|
Oleksii Kriuchykhin
|
e8fdfe7111
|
Implement datatables renderer for status data type [SCI-4032]
|
2019-11-29 10:19:04 +01:00 |
|
aignatov-bio
|
9eec36cb01
|
Refactor column type edit modal
|
2019-11-29 10:17:58 +01:00 |
|
Mojca Lorber
|
f1487561be
|
Reafactor javascript repository column
|
2019-11-29 10:17:48 +01:00 |
|
Mojca Lorber
|
467c80da52
|
Update basic modal layout for creating new column types
|
2019-11-29 10:16:47 +01:00 |
|
aignatov-bio
|
4f5fada41f
|
Merge pull request #2236 from aignatov-bio/ai-sci-4117-ui-activities-fixes
UI activtiies fixes [SCI-4117]
|
2019-11-28 14:54:07 +01:00 |
|
aignatov-bio
|
990d8e1c3a
|
Merge pull request #2218 from aignatov-bio/ai-sci-4088-remove-rte-from-team-description
Replace RTE with simple textarea [SCI-4088]
|
2019-11-28 14:45:06 +01:00 |
|
aignatov-bio
|
a87fc24251
|
UI activtiies fixes
|
2019-11-27 14:04:59 +01:00 |
|
aignatov-bio
|
3322676373
|
Replace RTE with simple textarea
|
2019-11-27 12:37:33 +01:00 |
|
aignatov-bio
|
75f29d7b04
|
Fix tag edit mode
|
2019-11-27 12:34:54 +01:00 |
|
aignatov-bio
|
8f2eaaacf9
|
Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page
Update css for global activities page [SCI-4111]
|
2019-11-25 14:08:33 +01:00 |
|
aignatov-bio
|
4a641ac03a
|
Merge pull request #2227 from aignatov-bio/ai-sci-4110-update-due-date-autosave-for-tags
Fix permission check and due date clear [SCI-4110]
|
2019-11-25 13:55:20 +01:00 |
|
aignatov-bio
|
e99fe2dbda
|
Update css for global activties page
|
2019-11-25 11:09:37 +01:00 |
|
aignatov-bio
|
fae8b252a6
|
Fix markup
|
2019-11-24 21:11:32 +01:00 |
|
aignatov-bio
|
e76b4ca26f
|
Fix permission check and due date clear
|
2019-11-24 21:06:34 +01:00 |
|
aignatov-bio
|
84a9d764e0
|
Add arrows controll for dropdown
|
2019-11-23 21:09:34 +01:00 |
|
aignatov-bio
|
96523ae131
|
Update CSS for team preferences and enable autosave
|
2019-11-22 10:46:44 +01:00 |
|
aignatov-bio
|
f2ed3198d5
|
Add due date autosave field
|
2019-11-21 12:14:43 +01:00 |
|
aignatov-bio
|
56ae32323c
|
Add autosave for protocol keywords and user preferences
|
2019-11-20 14:57:53 +01:00 |
|
aignatov-bio
|
32d99f676c
|
Fix markup
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
264493a322
|
Finish removing Select2 library
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
e7ad7ae969
|
New tags drop down
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
5964a1b1f4
|
Fix shadows
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
0ed3d84407
|
Fix styling
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
b1c32d9a30
|
Improve dropdown and side panel
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
163a17d6d9
|
Fix tablet view
|
2019-11-18 13:59:54 +01:00 |
|
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
|
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
|
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
|
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 |
|
aignatov-bio
|
ae0db3a7bc
|
Update avatars and small CSS fixes
|
2019-11-05 10:43:02 +01:00 |
|
Mojca Lorber
|
a3ded83292
|
Small css change
|
2019-10-30 15:42:11 +01:00 |
|
Mojca Lorber
|
7b86a3932a
|
Additional avatar small fixes
|
2019-10-30 15:23:14 +01:00 |
|
Mojca Lorber
|
a0873cb16d
|
Small improvements in the avatar settings
|
2019-10-29 13:21:22 +01: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 |
|
mlorb
|
ba8ee86c9f
|
Merge pull request #2128 from mlorb/ml-sci-3966
Fix position of shared inventory icon [SCI-3966]
|
2019-10-04 15:21:48 +02:00 |
|
Mojca Lorber
|
564321d327
|
Fix position of shared inventory icon
|
2019-10-04 15:18:17 +02:00 |
|
aignatov-bio
|
b460cd4384
|
Fix complete button position
|
2019-10-04 15:17:28 +02:00 |
|
aignatov-bio
|
c2c8343c57
|
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search
Fix MarvinJS representation in global search [SCI-3943]
|
2019-10-04 09:16:34 +02:00 |
|
Oleksii Kriuchykhin
|
6a6a43f5ff
|
Improve file processing indicator [SCI-3938]
|
2019-10-01 15:20:46 +02:00 |
|
aignatov-bio
|
675d5eb088
|
Fix MarvinJS representation in global search
|
2019-10-01 14:20:20 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Jure Grabnar
|
9f704559ef
|
Fix hound formatting issues
|
2019-09-30 14:42:15 +02:00 |
|
Jure Grabnar
|
096228abbb
|
Shorten padding format in scss
|
2019-09-30 14:32:09 +02:00 |
|
Urban Rotnik
|
9397705033
|
Fix positions of CoSign and Unlock buttons
|
2019-09-30 13:39:23 +02:00 |
|
Urban Rotnik
|
b13c429d26
|
SystemNotifications count position fixed
|
2019-09-30 13:12:35 +02:00 |
|
Urban Rotnik
|
dfafd4767c
|
Fix Protocol buttons group
[SCI-3929]
|
2019-09-30 11:51:37 +02:00 |
|
Jure Grabnar
|
b286e4adfd
|
Fix styles for notification bar
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
6e33baa995
|
Add skeleton restore-draft notification for module description
|
2019-09-30 11:32:38 +02:00 |
|
mlorb
|
594124dad6
|
Merge pull request #2053 from mlorb/ml-sci-3637
Redesign of sorting button for projects/experiments cards [SCI-3637]
|
2019-09-27 12:44:44 +02:00 |
|
Jure Grabnar
|
0c24210f6a
|
[SCI-3784] Small RTF improvements (#2061)
[SCI-3784] Small RTF improvements
|
2019-09-27 10:27:57 +02:00 |
|
mlorb
|
e3b0e149b6
|
Merge pull request #2077 from mlorb/ml-sci-3764
Expand clickable area of links in secondary navigation [SCI-3764]
|
2019-09-27 10:15:12 +02:00 |
|
Anton Ignatov
|
e01c438055
|
Fix padding for marvinjs modal
|
2019-09-24 11:02:15 +02:00 |
|
Mojca Lorber
|
a85c80d994
|
Fix bug with inventory navigation height
|
2019-09-23 16:12:41 +02:00 |
|
Mojca Lorber
|
9f30e05594
|
Expand clickable area of links in secondary navigation
|
2019-09-23 14:34:48 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +02:00 |
|
aignatov-bio
|
52499fa285
|
Fix pathe to icon for chemical structure (#2056)
|
2019-09-18 11:18:31 +02:00 |
|
Jure Grabnar
|
40aa1a37a2
|
Change colors of active buttons TinyMCE
Close SCI-3784
|
2019-09-17 15:45:27 +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 |
|
aignatov-bio
|
40b5b2406b
|
Fix big inventory names (#2046)
|
2019-09-11 15:44:38 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
aignatov-bio
|
481be7b92e
|
Fix padding to share modal (#2024)
|
2019-09-03 12:06:16 +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 |
|
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
|
0058198bb5
|
Merge branch 'master' into SCI-3806-shared-status-dropdown
|
2019-08-26 11:55:25 +02:00 |
|
mlorb
|
ffe06d5070
|
Merge pull request #2010 from mlorb/ml-sci-3805
Add a team name to inventory item card [SCI-3805]
|
2019-08-26 11:29:12 +02:00 |
|
aignatov-bio
|
b3e3c443f0
|
Fix big gap in title of navbar (#2015)
|
2019-08-26 11:20:03 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
Mojca Lorber
|
50c78f182c
|
Add a team name to inventory item card
|
2019-08-23 11:13:58 +02:00 |
|
aignatov-bio
|
d70b7e2272
|
Make share status icon dynamic (#2007)
|
2019-08-21 15:32:57 +02:00 |
|
aignatov-bio
|
f94b8165dc
|
Fix marvinjs edit button and icon (#1985)
|
2019-08-21 11:15:57 +02:00 |
|
aignatov-bio
|
4730e7bfee
|
Change notification counter position (#2000)
|
2019-08-21 10:39:56 +02:00 |
|
aignatov-bio
|
0b85dcbead
|
Fix long inventory names (#1999)
|
2019-08-21 10:39:48 +02:00 |
|
aignatov-bio
|
e2ad383c69
|
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title
* Fix markup
|
2019-08-21 10:39:37 +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 |
|
aignatov-bio
|
d4aedbb35f
|
Small ux changes for inventories (#1989)
|
2019-08-19 09:24:10 +02:00 |
|
Miha Mencin
|
5adb745743
|
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons
Fix assign/unassign buttons [SCI-3785]
|
2019-08-19 08:51:14 +02:00 |
|
Anton Ignatov
|
ec57e0aa91
|
Fix assign/unassign buttons
|
2019-08-16 10:05:01 +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 |
|
aignatov-bio
|
aad726ac40
|
Update CSS for share modal (#1978)
|
2019-08-12 15:02:16 +02:00 |
|
Urban Rotnik
|
d04b0ccff1
|
Move '+ new inventory' link above list in sidebar
|
2019-08-09 14:15:51 +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
|
466b05a5bc
|
Update repository index page
|
2019-08-09 14:15:48 +02:00 |
|
Mojca Lorber
|
26bd81621f
|
Add new icons also to the inventories list in navigation
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
7d4941015f
|
Update global search, so it will be able to search through shared inventories
|
2019-08-09 14:13:01 +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 |
|
aignatov-bio
|
aa5061a1af
|
Add custom context menu to TinyMCE images [SCI-3582] (#1944)
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
|
2019-08-07 10:28:42 +02:00 |
|
Oleksii Kriuchykhin
|
eaf9d59819
|
Merge branch 'activestorage_migration' into ok_SCI_3679
|
2019-08-06 15:27:31 +02:00 |
|
Jure Grabnar
|
b12403b769
|
Add comment name fix as Urban suggested
|
2019-07-31 09:23:22 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Oleksii Kriuchykhin
|
5e65b07bdc
|
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
|
2019-07-25 18:00:24 +02:00 |
|
Jure Grabnar
|
39fbd18316
|
Remove width on commments
Closes SCI-3674
|
2019-07-25 16:46:27 +02:00 |
|
Anton Ignatov
|
03a45d7dd8
|
Fix markup
|
2019-07-16 13:42:39 +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 |
|
aignatov-bio
|
a8623002e6
|
Small UI changes [SCI-3699] (#1935)
* Small ui changes
* Markup fix
* Add class for addons
|
2019-07-15 13:28:20 +02:00 |
|
aignatov-bio
|
894e201e1b
|
Fix big file issue in step attachments [SCI-3682] (#1919)
* Fix big file issue in step atachments
* Fix markup
|
2019-07-15 11:00:01 +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
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
aignatov-bio
|
26ef970a1e
|
Add academy button (#1924)
|
2019-07-12 11:15:34 +02:00 |
|
Urban Rotnik
|
d5fbe5ecd7
|
Fix for safari on external protocols tab
|
2019-07-11 11:53:49 +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 |
|
aignatov-bio
|
7ac410e573
|
Fix visual bugs across ProtocolIo [SCI-3671] (#1914)
* Fix visual bugs across ProtocolIo
|
2019-07-10 13:00:32 +02:00 |
|
mlorb
|
23270393b0
|
Merge branch 'master' into ml-sci-3634
|
2019-07-09 14:38:00 +02:00 |
|
Mojca Lorber
|
7bb82e2fc2
|
Fix eternal protocols tab visuals
|
2019-07-09 14:35:40 +02:00 |
|
aignatov-bio
|
fc78d8f401
|
Fix tooltip position (#1909)
|
2019-07-09 14:00:53 +02:00 |
|
aignatov-bio
|
01a01157d3
|
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table
* Add result tables
|
2019-07-08 13:19:12 +02:00 |
|
Jure Grabnar
|
ae7da78bff
|
Merge pull request #1897 from jbargu/jg_sci_3646
[SCI-3646] Add paging functionality to external protocols
|
2019-07-08 13:06:19 +02:00 |
|
aignatov-bio
|
6d423ed986
|
Make Navbar icons bigger [SCI-3663] (#1900)
* Make Navbar icons bigger
|
2019-07-08 12:53:43 +02:00 |
|
Mojca Lorber
|
989c10872c
|
Fixes visual bugs on protocols.io and home page
|
2019-07-04 18:22:51 +02:00 |
|
Jure Grabnar
|
dc7fee51fa
|
Add Show more protocols functionality to external protocols
Closes SCI-3646
|
2019-07-04 15:35:18 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
Miha Mencin
|
669592f62c
|
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar
SCI-3640 Search line on Safari external protocols page needs update
|
2019-07-03 14:18:02 +02:00 |
|
Miha Mencin
|
1b31f7f30a
|
SCI-3640 set max width of search bar to 50%
|
2019-07-03 13:16:07 +02:00 |
|
Miha Mencin
|
37cc526ac9
|
fix CR comments
|
2019-07-03 10:22:59 +02:00 |
|
Miha Mencin
|
74b4e0d774
|
SCI-3644 hide the import button and show it only on hover & when appropriate user
|
2019-07-02 18:24:07 +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 |
|
Jure Grabnar
|
ebbb36cc6d
|
Remove border from the import button
|
2019-06-28 11:32:47 +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
|
5430fb311d
|
Hound fixes
|
2019-06-28 10:41:20 +02:00 |
|
Jure Grabnar
|
1ccabf62b3
|
Add preview banner in external protocols
|
2019-06-28 01:38:33 +02:00 |
|
Jure Grabnar
|
81695665c7
|
Add hover effect on the card
|
2019-06-28 00:47:08 +02:00 |
|
Jure Grabnar
|
d3afcbed50
|
Style card view on external protocols
Closes SCI-3535
|
2019-06-28 00:43:05 +02:00 |
|
Jure Grabnar
|
0a77cedaf8
|
Fix sorting of external protocols and start showing results
|
2019-06-27 22:48:56 +02:00 |
|
Jure Grabnar
|
8338892fc6
|
Update external protocols form to include sort_by
|
2019-06-27 21:26:28 +02:00 |
|
Urban Rotnik
|
9cb4454537
|
New implementation for attachments creation
|
2019-06-27 17:02:06 +02:00 |
|
Urban Rotnik
|
2761079479
|
Add modal for import
|
2019-06-27 16:46:02 +02:00 |
|
Anton Ignatov
|
31c6802a06
|
Add support for marvinjs on service
|
2019-06-23 00:09:49 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Anton Ignatov
|
dfece85ea1
|
Fix handsone table
|
2019-06-21 11:16:44 +02:00 |
|
Jure Grabnar
|
b2b752fcf8
|
Fix hound complaints
|
2019-06-19 23:37:04 +02:00 |
|
Jure Grabnar
|
fcd42a4178
|
Fix border radius around active sort button
|
2019-06-19 22:59:30 +02:00 |
|
Jure Grabnar
|
b3c3b68dc2
|
Add external preview to External Protocols tab
Closes SCI-3563
|
2019-06-19 22:54:20 +02:00 |
|
aignatov-bio
|
83b9efd7dd
|
Fix right floating images in RTE editor (#1842)
|
2019-06-19 14:06:33 +02:00 |
|
Jure Grabnar
|
7adef9cc9e
|
Change sort buttons positions
Closes SCI-3534
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
218cf84775
|
Hound fixes
|
2019-06-17 12:24:12 +02:00 |
|
Jure Grabnar
|
d103f8ffec
|
Finish external protocols screen
Closes SCI-3534
|
2019-06-17 12:24:12 +02:00 |
|
aignatov-bio
|
2dfbdacfa3
|
Change restore button background (#1829)
|
2019-06-14 16:21:01 +02:00 |
|
aignatov-bio
|
da8d748c49
|
Fix small comments bugs (#1832)
|
2019-06-14 16:20:47 +02:00 |
|
aignatov-bio
|
7a3eedf461
|
Adding missing avatars to comments (#1838)
|
2019-06-14 16:20:13 +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 |
|
mlorb
|
fa28e772f0
|
Merge pull request #1807 from mlorb/ml-sci-3508
Fix some css on step panel heading [SCI-3508]
|
2019-06-11 11:12:12 +02:00 |
|
Mojca Lorber
|
ca1b91a409
|
css fix again
|
2019-06-10 11:23:40 +02:00 |
|
aignatov-bio
|
d207cf5dce
|
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
|
2019-06-04 14:40:21 +02:00 |
|
aignatov-bio
|
cd7460a4bd
|
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
|
2019-05-31 15:44:27 +02:00 |
|
Anton Ignatov
|
c9a29b12ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-31 10:27:14 +02:00 |
|
Mojca Lorber
|
ca4d8e71bb
|
fix some css on step panel heading
|
2019-05-29 13:56:55 +02:00 |
|
aignatov-bio
|
0b3b6d593b
|
Small style fixes [SCI-3498] (#1799)
* Adding error, if TinyMCE asset not in text, when we copy anything
* Small style fixes
|
2019-05-27 16:27:27 +02:00 |
|
aignatov-bio
|
da33a053cf
|
Fix avatar image position on global activities (#1792)
|
2019-05-22 10:21:18 +02:00 |
|
aignatov-bio
|
2cee46a10d
|
Fix experiment name length (#1789)
|
2019-05-21 15:54:01 +02:00 |
|
aignatov-bio
|
d97e803d01
|
Adding placeholder to TinyMCE editor (#1788)
|
2019-05-21 15:53:47 +02:00 |
|
aignatov-bio
|
2de2ead723
|
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
|
2019-05-21 15:19:44 +02:00 |
|
aignatov-bio
|
5081546c78
|
Fix padding for protocol description (#1782)
|
2019-05-21 10:21:30 +02:00 |
|
aignatov-bio
|
d959769b65
|
Fix experiment and step title (#1779)
|
2019-05-20 11:20:08 +02:00 |
|
Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
aignatov-bio
|
24e30867da
|
Add smart annotation to comments [SCI-3458] (#1768)
* Add smart annotation to comments
|
2019-05-15 14:59:15 +02:00 |
|
aignatov-bio
|
f970eea525
|
Some gui fixes (#1757)
|
2019-05-14 09:43:02 +02:00 |
|
Oleksii Kriuchykhin
|
4b1c4bd140
|
Fix handling of proccessing step attachments [SCI-3381]
|
2019-05-13 17:12:06 +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
|
71b3228310
|
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
|
2019-05-13 10:45:12 +02:00 |
|
aignatov-bio
|
2010b3ad8f
|
Fix step comments bugs (#1751)
|
2019-05-13 09:49:53 +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
|
584cf4b93b
|
Change Office icon on the create New Office buttons
|
2019-05-10 17:51:29 +02:00 |
|
mlorb
|
110c4ec460
|
Merge pull request #1743 from mlorb/ml-sci-3386
Fix tiny mce visuals, saving and cursor position [SCI-3386]
|
2019-05-10 17:45:12 +02:00 |
|
aignatov-bio
|
f684ddd365
|
Change dropdown highlight color and fix task tag position [SCI-3410] (#1735)
* Change dropdown highlight color and fix task tag position
|
2019-05-10 16:37:59 +02:00 |
|
Mojca Lorber
|
8e6413b031
|
Fix tiny mce visuals, saving and cursor position
|
2019-05-10 10:52:14 +02:00 |
|
Anton Ignatov
|
995408e7fc
|
Fix protocol update error, rollback bootstrap gems and fix step name
|
2019-05-08 17:18:19 +02:00 |
|
Anton Ignatov
|
dcf94e78e1
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-08 14:03:41 +02:00 |
|
Anton Ignatov
|
2a294c408f
|
Fix due date alignment and chage header structure from bootstrap to flexbox
|
2019-05-06 16:20:00 +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
|
f73dd38780
|
Add image editor to tinymce drawings
|
2019-04-30 18:32:59 +02:00 |
|
Anton Ignatov
|
4d0d5aa014
|
Adding team sketches selector
|
2019-04-30 17:32:55 +02:00 |
|
Mojca Lorber
|
7be151bd2d
|
Visual fixes for edit/add step on protocol
|
2019-04-30 14:57:50 +02:00 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
aignatov-bio
|
26dc1a0a4a
|
Note section css issues [SCI-3378] (#1715)
* Fix step name width bug
|
2019-04-30 10:23:44 +02:00 |
|
aignatov-bio
|
7d197a6f02
|
Remove gray step headers (#1713)
|
2019-04-29 14:06:55 +02:00 |
|
Anton Ignatov
|
f80d881847
|
Fix markup
|
2019-04-28 19:11:41 +02:00 |
|
Anton Ignatov
|
260810fff8
|
Add editing mode for tinymce images
|
2019-04-28 16:16:31 +02:00 |
|
Anton Ignatov
|
193edfbc35
|
Add marvin js support to TinyMCE
|
2019-04-27 22:54:59 +02:00 |
|
Anton Ignatov
|
54731856f0
|
Finish step chemical attachments
|
2019-04-27 19:08:40 +02:00 |
|
Anton Ignatov
|
cf4ff41ec6
|
Add delete feature
|
2019-04-27 13:51:35 +02:00 |
|
Anton Ignatov
|
46f0e0c0c2
|
Add marvin js assets to assets sort and name field
|
2019-04-27 12:46:45 +02:00 |
|
Anton Ignatov
|
fe620c4a63
|
Add marvin model and controller
|
2019-04-26 22:59:38 +02:00 |
|
Anton Ignatov
|
40c1c9aef7
|
Add marvin js modal
|
2019-04-26 18:24:21 +02:00 |
|
Urban Rotnik
|
3b063348ce
|
Hide remove icon and show only on attachment hover
|
2019-04-26 15:51:35 +02:00 |
|
Urban Rotnik
|
88050b9b93
|
Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable
Fix for inline editing on Firefox [SCI-3383]
|
2019-04-26 15:46:37 +02:00 |
|
aignatov-bio
|
dc7fddc60a
|
Improve task tags (#1708)
|
2019-04-26 15:38:33 +02:00 |
|
aignatov-bio
|
9fbfa9215e
|
Add zoom to image annotation [SCI-3374] (#1694)
* Add zoom to image annotation
|
2019-04-26 15:21:01 +02:00 |
|
aignatov-bio
|
57b80280dc
|
Update attachemnts css (#1700)
|
2019-04-26 15:20:39 +02:00 |
|
Urban Rotnik
|
8413ed5ab0
|
Fix for inline editing on Firefox
|
2019-04-26 14:22:18 +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 |
|
Anton Ignatov
|
0779ed598b
|
Reuse inline editing logic
|
2019-04-25 11:14:55 +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
|
7a2bfc12ce
|
Remove form_asset partial
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
ea0368aa11
|
Attachments update for edit page
|
2019-04-23 13:50:47 +02:00 |
|
Anton Ignatov
|
7d60eb5572
|
Fix migration issues
|
2019-04-23 11:11:22 +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
|
92d8e42a92
|
Add floating toolbar for tinymce (#1688)
|
2019-04-19 15:12:06 +02:00 |
|
aignatov-bio
|
ba1e3dc3c6
|
Add smooth loading for inline task and protoocl description editing (#1682)
|
2019-04-19 14:47:05 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
aignatov-bio
|
063f02dc56
|
Add ability to select filters with keyboard [SCI-3200] (#1649)
* Add ability to select fitlers with keyboard
|
2019-04-15 10:30:08 +02:00 |
|
Mojca Lorber
|
bf2e9e8194
|
Rename button load more system notification to fix the bug
|
2019-04-12 11:58:47 +02:00 |
|
mlorb
|
3c0b1984d0
|
Merge pull request #1658 from mlorb/ml-sci-3297
Fix activity card visuals [SCI-3297]
|
2019-04-12 09:20:11 +02:00 |
|
aignatov-bio
|
ffb0db06b9
|
Add scroll to team selector (#1659)
|
2019-04-12 09:17:14 +02:00 |
|
Mojca Lorber
|
c8ddae4d1e
|
Fix activity card visuals
|
2019-04-10 12:37:13 +02:00 |
|
aignatov-bio
|
7ef7e2397f
|
Change activity filter order and reduce custom date label size [SCI-3301] (#1651)
* Change activity filter order and reduce custom date label size
* Fix hound
|
2019-04-09 14:18:22 +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 |
|
Urban Rotnik
|
26cf8271a1
|
Change step header, remove vertical line
|
2019-04-05 10:57:38 +02:00 |
|
Jure Grabnar
|
56bb62c5b0
|
Addtional formatting fixes
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
20446fb39d
|
Hound formatting fixes
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
cbf109f884
|
Fix create WOPI file button
Closes SCI-3137
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
fddff9c627
|
Perform styling on the WOPI modal
|
2019-04-04 17:05:25 +02:00 |
|
Oleksii Kriuchykhin
|
e7151e6e6b
|
Disable inventory import activity logging [SCI-3290]
|
2019-04-03 22:42:33 +02:00 |
|
aignatov-bio
|
daaa6a367b
|
Adding custom scrollbar to global activities [SCI-3206] (#1623)
* Adding custom scrollbar to global activities
|
2019-04-02 09:56:50 +02:00 |
|
Jure Grabnar
|
fe3e92468f
|
Merge pull request #1611 from jbargu/jg_sci_3226_3243
Too much empty space between date buttons [SCI-3243] [SCI-3226]
|
2019-03-29 12:30:53 +01:00 |
|
aignatov-bio
|
ce7bbd6b07
|
Adding deselect button to objects filter and some localizations fix (#1608)
|
2019-03-29 09:04:58 +01:00 |
|
Jure Grabnar
|
226cf21787
|
No top margin for select custom dates button
|
2019-03-29 08:42:15 +01:00 |
|
Jure Grabnar
|
e9133bbea9
|
Remove empty space between date buttons
Closes SCI-3243
|
2019-03-29 08:29:16 +01: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
|
685b7138b7
|
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list
Add message for empty activity list [SCI-3224]
|
2019-03-28 09:16:29 +01:00 |
|
Urban Rotnik
|
d0a8652969
|
Add message for empty activity list
|
2019-03-28 09:14:01 +01:00 |
|
Jure Grabnar
|
9881ff38ee
|
Add color to HOT buttons
|
2019-03-27 15:34:01 +01:00 |
|
Anton Ignatov
|
03123c34f8
|
adding date placeholder
|
2019-03-27 14:39:29 +01:00 |
|
Anton Ignatov
|
1d244508f5
|
Adding placeholders to filters
|
2019-03-27 11:19:58 +01:00 |
|
Miha Mencin
|
1b19e67c07
|
Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d .
|
2019-03-27 10:21:40 +01:00 |
|
aignatov-bio
|
a3c1796497
|
Adding arrow to drop down [SCI-3212] (#1594)
* Adding arrow to dropdown
|
2019-03-26 16:49:12 +01:00 |
|
aignatov-bio
|
6012513c13
|
Reduce font size of filters title [SCI-3208] (#1592)
* reduce font size of filters titles;
* fix new title
|
2019-03-26 16:47:36 +01:00 |
|
Alex Kriuchykhin
|
935e3a65cf
|
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
|
2019-03-26 16:02:44 +01:00 |
|
aignatov-bio
|
54fd3a748b
|
Adding activity groups [SCI-3203] (#1588)
* Adding activty groups
|
2019-03-26 15:29:21 +01:00 |
|
Urban Rotnik
|
738d6f0f8c
|
Merge pull request #1590 from urbanrotnik/ur-SCI-3209-circles-to-checkboxes
Add fontawesome checkmark before dropdown item [SCI-3209]
|
2019-03-26 13:49:19 +01:00 |
|
Urban Rotnik
|
68d87efaa0
|
Merge pull request #1582 from urbanrotnik/ur-SCI-3134-changes-to-step-design
Step header changes, removed vertical line [SCI-3134]
|
2019-03-26 12:38:04 +01:00 |
|
Urban Rotnik
|
96fa620c4c
|
Add fontawesome checkmark before dropdown item
SCI-3209
|
2019-03-26 12:35:17 +01:00 |
|
aignatov-bio
|
cee3796f35
|
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left
Move dropdown container to left [SCI-3203]
|
2019-03-26 09:37:12 +01:00 |
|
Oleksii Kriuchykhin
|
e3a3ec4491
|
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]
|
2019-03-25 17:38:13 +01:00 |
|
Urban Rotnik
|
b0f0ded87d
|
Step header changes, removed vertical line
SCI-3134
|
2019-03-25 17:25:13 +01:00 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
Anton Ignatov
|
2d5df1b3b7
|
Moving dropdown container to left
|
2019-03-25 13:56:32 +01:00 |
|
aignatov-bio
|
fd6e622b95
|
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates
Remove white spaces for date in global activities [SCI-3205]
|
2019-03-25 12:58:35 +01:00 |
|
Anton Ignatov
|
c584a0d606
|
Remove white spaces for date in global activites
|
2019-03-25 11:06:00 +01:00 |
|
Anton Ignatov
|
c8c211f245
|
Remove whitespace to breadcrumbs
|
2019-03-25 09:39:17 +01:00 |
|
Anton Ignatov
|
bc58f0aecd
|
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
|
2019-03-21 11:48:51 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
b46f3566ef
|
Fix rendering of HTML in RTE fields [SCI-3111]
|
2019-03-19 23:32:24 +01:00 |
|
Anton Ignatov
|
f606210652
|
Rubocop fix
|
2019-03-19 13:52:03 +01:00 |
|
Anton Ignatov
|
87280f083a
|
[SCI-3166] Finalize global activities front end
|
2019-03-19 13:50:55 +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 |
|
Oleksii Kriuchykhin
|
645930b8d7
|
Merge branch 'master' into features/note-section
|
2019-03-14 16:25:51 +01:00 |
|
Oleksii Kriuchykhin
|
ded74044de
|
Fix circle icon in image editor [SCI-2855]
|
2019-03-11 15:10:38 +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 |
|
Oleksii Kriuchykhin
|
0b87e8e1e4
|
Merge branch 'features/global-activities' into ok_SCI_3024_v3
|
2019-03-08 10:29:51 +01:00 |
|
aignatov-bio
|
ec2dbb897f
|
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
|
2019-03-06 10:34:04 +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 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Anton Ignatov
|
33682bb561
|
Bold text for read messages
|
2019-03-04 13:48:25 +01:00 |
|
Miha Mencin
|
a372ebf07d
|
Revert "Task info section improvements [SCI - 3058]"
|
2019-02-27 21:00:11 +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 |
|
Anton Ignatov
|
a4cabb203b
|
Task info section improvements
|
2019-02-25 16:55:09 +01:00 |
|
Miha Mencin
|
76c3db0b11
|
added layout, added css, added select2 lib, WIP
|
2019-02-25 16:50:38 +01:00 |
|
Anton Ignatov
|
6971d1a55d
|
Adding new Select2 library with customization
|
2019-02-22 16:40:33 +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 |
|
Urban Rotnik
|
b50320a4bc
|
Add margin for system notification modal
|
2019-02-21 15:15:33 +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 |
|
aignatov-bio
|
35268252c8
|
After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] (#1504)
* Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr
|
2019-02-20 13:15:16 +01:00 |
|
Mojca Lorber
|
ebfacdd62c
|
change experiments title color
|
2019-02-19 14:24:23 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
a033e9b207
|
Fix Lato font loading [SCI-2969]
|
2019-02-04 15:36:17 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
mlorb
|
a297ef2094
|
Merge pull request #1443 from mlorb/ml-sci-2914
Allow org. administrators to invite them onto all projects [SCI-2914]
|
2019-01-24 16:24:57 +01:00 |
|
mlorb
|
d2108ac3ea
|
fix hound
|
2019-01-18 16:16:00 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
ec28db6f4f
|
Fix image URLs in export all document [SCI-2931]
|
2019-01-10 14:19:40 +01:00 |
|
mlorb
|
06b1e5cf20
|
Allow org. administrators to invite them onto all projects
|
2019-01-08 16:30:52 +01:00 |
|
Oleksii Kriuchykhin
|
97bde075b2
|
Change color of the selected element in the side navigation [SCI-2909]
|
2018-12-13 16:50:22 +01:00 |
|
Luka Murn
|
022d0d9512
|
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix
Change export all to use HTML instead of PDF [SCI-2902]
|
2018-12-13 15:19:37 +01:00 |
|
Luka Murn
|
65adc7a556
|
Fix 2 minor visual bugs in reports
|
2018-12-12 11:15:32 +01:00 |
|
mlorb
|
4040b31143
|
Fix behavior when user has no teams
|
2018-12-10 15:42:05 +01:00 |
|
Alex Kriuchykhin
|
51ba74cbab
|
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
Enable caching for navigation sidebar [SCI-2757]
|
2018-12-10 14:11:05 +01:00 |
|
mlorb
|
3031fb7a4b
|
Merge pull request #1398 from mlorb/ml-sci-2786
Fix projects table css [SCI-2786]
|
2018-12-06 09:15:51 +01:00 |
|
mlorb
|
c7f5c17e7e
|
change css again
|
2018-12-04 11:21:54 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
Luka Murn
|
8b1449b5a2
|
Add bottom margin to OAuth authorize page, for better mobile xp
|
2018-11-28 21:46:33 +01:00 |
|
mlorb
|
15ddd0ab91
|
fix projects table css
|
2018-11-27 12:37:10 +01:00 |
|
Oleksii Kriuchykhin
|
79544e789d
|
Fix support menu for Safari [SCI-2885]
|
2018-11-26 18:47:21 +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
|
59fb971394
|
Change text color on project cards tabs [SCI-2872]
|
2018-11-20 17:31:27 +01:00 |
|
Oleksii Kriuchykhin
|
d98f11abdc
|
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-20 17:02:45 +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 |
|
Luka Murn
|
42793d25b7
|
Add bottom padding to sign in/up/forgot password pages
Closes SCI-2764.
|
2018-10-24 13:57:58 +02:00 |
|
Matej Zrimšek
|
1575da6edb
|
Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641]
|
2018-10-12 07:40:22 +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
|
ba58eec2e2
|
Merge latest features/export-all [SCI-2731]
|
2018-10-03 11:04:44 +02:00 |
|
Oleksii Kriuchykhin
|
53874c4680
|
Fix Hound config and CSS code styling [SCI-2730]
|
2018-10-03 10:39:22 +02:00 |
|
Oleksii Kriuchykhin
|
7d995189bd
|
Fixies after code review [SCI-2730]
|
2018-10-02 14:24:44 +02:00 |
|
Luka Murn
|
d71be76657
|
Fix minor styling & text on settings - preferences page
|
2018-10-02 13:59:19 +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
|
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 |
|
Zanz2
|
87d2b0db14
|
fixed accordign to pr review
|
2018-09-24 15:57:31 +02:00 |
|
Zanz2
|
07757e382a
|
fixed hound
|
2018-09-14 13:43:31 +02:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Zanz2
|
db610f146f
|
fixed hound
|
2018-08-29 11:41:07 +02:00 |
|
Zanz2
|
c84ff3d9fe
|
Small oversight fix
|
2018-08-29 11:37:07 +02:00 |
|
Zanz2
|
ed5a5e7390
|
Fixed blue block in dropdown, now its a full line
|
2018-08-29 11:33:20 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
Luka Murn
|
f23cc36803
|
Merge pull request #1224 from ZmagoD/zd_SCI_2429
fixes setting sidebar teams link[fixes SCI-2429]
|
2018-07-13 14:55:24 +02:00 |
|
zmagod
|
6585eaa338
|
fixes hound
|
2018-07-09 12:55:25 +02:00 |
|
zmagod
|
14254fbde3
|
fixes per @mlorb 's request
|
2018-07-09 12:54:02 +02:00 |
|
zmagod
|
dd00de928c
|
fixes css for new repository item field field [fixes SCI-2593]
|
2018-07-09 10:33:19 +02:00 |
|
Zmago Devetak
|
db90736c62
|
Merge pull request #1237 from ZmagoD/zd_SCI_2512
fixes list item height on columns management page [fixes SCI-2512]
|
2018-07-06 10:47:29 +02:00 |
|
zmagod
|
f1833b9bc1
|
fixes list item height on columns management page [fixes SCI-2512]
|
2018-07-06 09:28:03 +02:00 |
|
zmagod
|
a55d0b9c85
|
fixes file name label in repository file field [fixes SCI-2592]
|
2018-07-05 16:59:59 +02:00 |
|
zmagod
|
c9dd8b356a
|
fixes locale, fixes custom file upload style
|
2018-07-04 13:43:45 +02:00 |
|
zmagod
|
8b86891177
|
fixes file destroy button [fixes SCI-2546]
|
2018-07-03 15:25:37 +02:00 |
|
zmagod
|
1a15ac7acf
|
fixes setting sidebar teams link[fixes SCI-2429]
|
2018-06-26 13:09:56 +02:00 |
|
zmagod
|
4b81c2c4db
|
fixes tagsinput text-area on long input [fixes SCI-2566]
|
2018-06-26 09:52:07 +02:00 |
|
mlorb
|
0792ce46af
|
fix firefox bug with browse buttons position
|
2018-06-19 13:39:03 +02:00 |
|
Zmago Devetak
|
2eb6613c6a
|
Merge pull request #1206 from ZmagoD/zd_SCI_2442
make manage columns page more responsive [fixes SCI-2442]
|
2018-06-13 11:14:35 +02:00 |
|
Zmago Devetak
|
50c1a712d8
|
Merge pull request #1204 from ZmagoD/zd_SCI_2434
fixes bug with repository items dropdown [fixes SCI-2434]
|
2018-06-13 08:42:13 +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
|
1cff4a5060
|
make manage columns page more responsive [fixes SCI-2442]
|
2018-06-12 10:22:48 +02:00 |
|
zmagod
|
256e502982
|
fixes bug with repository items dropdown [fixes SCI-2434]
|
2018-06-11 14:57:27 +02:00 |
|
Luka Murn
|
bfaedab4b4
|
Fix buttons style on tags modal
Closes SCI-2397.
|
2018-06-08 13:43:23 +02:00 |
|
Luka Murn
|
dbceac7aa4
|
Style inventories secondary navigation section
|
2018-06-08 08:31:22 +02:00 |
|
Luka Murn
|
4cdfe67115
|
Fix protocol management filter display (css)
|
2018-06-07 15:57:59 +02:00 |
|
Luka Murn
|
b324a2dab3
|
Restyle activities page
|
2018-06-07 09:29:47 +02:00 |
|
Luka Murn
|
4ba07fb082
|
Merge pull request #1186 from Ducz0r/lm-sci-2477-fix
Move sign-in flow layout to core [SCI-2477]
|
2018-06-01 15:08:44 +02:00 |
|
mlorb
|
0a8bfdb860
|
Reposition the arrow for opening/closing of Navigation
|
2018-06-01 13:18:49 +02:00 |
|
Luka Murn
|
20ffa57583
|
Move sign-in flow layout to core
Closes SCI-2477.
|
2018-06-01 09:11:48 +02:00 |
|
mlorb
|
858b95d851
|
fix align bullet with a file name
|
2018-05-30 13:58:16 +02:00 |
|
okriuchykhin
|
2e79af3412
|
Merge pull request #1174 from okriuchykhin/ok_SCI_2458
Fix left menu word breaking [SCI-2458]
|
2018-05-28 13:06:26 +02:00 |
|
Luka Murn
|
e611e76fae
|
Fix Hound errors
|
2018-05-28 11:53:49 +02:00 |
|
Oleksii Kriuchykhin
|
f0362a0c02
|
Fix left menu word breaking [SCI-2458]
|
2018-05-28 10:42:07 +02:00 |
|
Luka Murn
|
b3ae1d8fa6
|
Remove some dead code, make sidebar toggle animated
|
2018-05-27 16:24:47 +02:00 |
|
Luka Murn
|
8b527d8a5b
|
Restyle left side menu bar so it also works with lower heights
|
2018-05-27 15:24:49 +02:00 |
|
Luka Murn
|
fe3ddb7c65
|
Update code so it works
|
2018-05-25 08:50:27 +02:00 |
|
mlorb
|
3368e3b963
|
Merge branch 'ux-release-1' into ml-sci-2271
|
2018-05-23 14:06:54 +02:00 |
|
mlorb
|
79f1a1c0ad
|
fix padding and change label colors
|
2018-05-23 11:13:28 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
mlorb
|
e3fc0237c1
|
Merge pull request #1153 from mlorb/ml-sci-2440
Final button colour changes [SCI-2440]
|
2018-05-21 16:29:04 +02:00 |
|
okriuchykhin
|
6dbb5bc583
|
Merge pull request #1152 from okriuchykhin/ok_SCI_2403
Change remove file button appearence [SCI-2403]
|
2018-05-18 17:34:56 +02:00 |
|
mlorb
|
0fccc71fc3
|
fix load protocol wording and UI-style
|
2018-05-18 16:57:18 +02:00 |
|
mlorb
|
81392362ac
|
Final button colour changes
|
2018-05-18 16:24:24 +02:00 |
|
Oleksii Kriuchykhin
|
b79b0b79cf
|
Change remove file button appearence [SCI-2403]
|
2018-05-18 14:51:45 +02:00 |
|
mlorb
|
876717e355
|
add pointer cursor to arrow
|
2018-05-18 13:34:52 +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 |
|
mlorb
|
7bda68b9f4
|
Merge pull request #1146 from mlorb/ml-sci-2336-v3
Add locales [SCI-2336]
|
2018-05-17 13:29:47 +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 |
|
mlorb
|
933a98c1f6
|
fix smart anotation color
|
2018-05-17 11:01:15 +02:00 |
|
okriuchykhin
|
e9d6b26ec6
|
Merge pull request #1141 from okriuchykhin/ok_SCI_2403
Add clear file selector button to repository edit [SCI-2403]
|
2018-05-16 14:55:53 +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
|
98baa77846
|
fixes cursor icon
|
2018-05-16 12:02:46 +02:00 |
|
Oleksii Kriuchykhin
|
c8094f196c
|
Add margin to clear button and fix case with new file in the cell [SCI-2403]
|
2018-05-16 11:25:43 +02:00 |
|
zmagod
|
7e3dbcd92f
|
hound
|
2018-05-16 10:43:25 +02:00 |
|
zmagod
|
712a3c7ff6
|
fixes css, changes spinner in preview modal
|
2018-05-16 10:40:49 +02:00 |
|
Oleksii Kriuchykhin
|
be5d481cdc
|
Add clear file selector button to repository edit [SCI-2403]
|
2018-05-16 10:32:50 +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
|
5f462165b5
|
change font and alerts colors
|
2018-05-15 14:16:34 +02:00 |
|
mlorb
|
dfe65ccaed
|
UI/UX restyle - fixes throughout application - part 2
|
2018-05-14 18:33:57 +02:00 |
|
mlorb
|
f01cfc2968
|
fix hound
|
2018-05-14 12:08:45 +02:00 |
|
mlorb
|
ed27a7a62a
|
some extra restyling/unifying off app
|
2018-05-11 18:02:17 +02:00 |
|
zmagod
|
e5c3fb6af2
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
|
2018-05-10 10:38:56 +02:00 |
|
zmagod
|
38869ec037
|
adds title on disabled download file link
|
2018-05-10 09:47:10 +02:00 |
|
mlorb
|
13f9ec30b8
|
fix hound
|
2018-05-09 13:56:32 +02:00 |
|
mlorb
|
7df40e56c7
|
UI/UX restyle - fixes throughout application part one
|
2018-05-08 16:33:42 +02:00 |
|
Zmago Devetak
|
ee307886df
|
Merge pull request #1124 from ZmagoD/zd_SCI_2347
fix the missing icons on task card [fixes SCI-2347]
|
2018-05-04 09:34:49 +02:00 |
|
zmagod
|
0177dc811b
|
fixes per @mojca 's request
|
2018-05-03 16:21:29 +02:00 |
|
zmagod
|
abbc0995f2
|
fix css
|
2018-05-03 14:51:49 +02:00 |
|
zmagod
|
60e5aa8716
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2
|
2018-05-03 14:49:06 +02:00 |
|
zmagod
|
f04677600b
|
fix the missing icons on task card [fixes SCI-2347]
|
2018-05-03 10:05:40 +02:00 |
|
zmagod
|
66b676b5ce
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
|
2018-04-26 17:04:36 +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
|
4d6e995481
|
add dismiss buttons back
|
2018-04-25 10:43:16 +02:00 |
|
zmagod
|
c2d19fee52
|
fixes images preview in repository/library [fixes SCI-2321]
|
2018-04-24 13:11:55 +02:00 |
|
zmagod
|
e96b690a5b
|
removes reports link from secondary navigation, fix bug with turbolinks
|
2018-04-20 11:57:52 +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
|
487fb1fb48
|
Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2
Zd sci 2239 v2
|
2018-04-19 18:00:19 +02:00 |
|
mlorb
|
72c79013de
|
fix file preview background
|
2018-04-19 17:40:24 +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 |
|
zmagod
|
a948710576
|
fixes alert label [fixes SCI-2239]
|
2018-04-19 15:51:36 +02:00 |
|
mlorb
|
8753df7ce3
|
Merge pull request #1103 from mlorb/ml-sci-2309
Fix top navigation style [SCI-2309]
|
2018-04-19 15:16:27 +02:00 |
|
mlorb
|
c1832969b4
|
fix top navigation style
|
2018-04-19 13:26:10 +02:00 |
|
mlorb
|
4f0c2a8122
|
fix screen responsiveness
|
2018-04-18 17:06:47 +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 |
|
mlorb
|
04a20ab7ec
|
change links
|
2018-04-16 17:05:22 +02:00 |
|
zmagod
|
a2d8285f35
|
fixes archive button but [fixes SCI-2300]
|
2018-04-16 09:22:10 +02:00 |
|
Luka Murn
|
09c60d2468
|
Fixes per @Ducz0r's request
|
2018-04-12 14:38:22 +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 |
|
Zmago Devetak
|
bdb6554870
|
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219
adds manage columns page
|
2018-04-06 17:06:28 +02:00 |
|
zmagod
|
cf7761daaa
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223
|
2018-04-06 12:56:39 +02:00 |
|
zmagod
|
c0cc6c293a
|
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
|
2018-04-05 13:15:32 +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 |
|
Oleksii Kriuchykhin
|
9720063fb3
|
Fix tests [SCI-2217]
|
2018-04-05 00:06:11 +02:00 |
|
zmagod
|
525a1c15ca
|
fixes hound
|
2018-04-04 16:40:07 +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 |
|
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 |
|
mlorb
|
11c0f5e5a1
|
Merge pull request #1067 from mlorb/ml-sci-2243
Style Guide - refactor colors, typography and buttons [SCI-2243]
|
2018-04-03 11:30:02 +02:00 |
|
Oleksii Kriuchykhin
|
51860652c1
|
Refactor smart annotations modal [SCI-2223]
|
2018-04-02 20:38:56 +02:00 |
|
mlorb
|
6a20c37449
|
fix travis againnnnn
|
2018-03-30 17:16:18 +02:00 |
|
mlorb
|
5f0d33d75e
|
fix travis again
|
2018-03-30 16:47:23 +02:00 |
|
Oleksii Kriuchykhin
|
cc5d8550b1
|
Refactor file preview modal [SCI-2217]
|
2018-03-30 11:50:28 +02:00 |
|
mlorb
|
10b5e1de84
|
refactor typography
|
2018-03-30 09:54: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 |
|
mlorb
|
4bf9369bc5
|
refactor buttons
|
2018-03-29 13:58:14 +02:00 |
|
mlorb
|
22afa61b11
|
refactor colors
|
2018-03-28 13:54:01 +02:00 |
|
Oleksii Kriuchykhin
|
fac5875cfd
|
Add repository name to record info modal [SCI-2205]
|
2018-03-26 16:18: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 |
|
mlorb
|
faaecec2ff
|
implement new Help dropup in navigation
|
2018-03-23 14:08:27 +01:00 |
|
mlorb
|
bc06542ed7
|
refactor project navigation
|
2018-03-22 11:41:33 +01:00 |
|
zmagod
|
3be3c00574
|
adds manage columns page [fixes SCI-2218]
|
2018-03-22 09:35:36 +01:00 |
|
zmagod
|
81df97f008
|
add library sidebar and create new library button [fixes SCI-2121]
|
2018-03-21 09:22:55 +01:00 |
|
mlorb
|
35afc06cbd
|
Merge pull request #1038 from mlorb/ml-sci-2118
Code left-side menu bar [SCI-2118]
|
2018-03-20 14:40:55 +01:00 |
|
Zmago Devetak
|
75d7ace8c7
|
Merge pull request #1017 from ZmagoD/zd_SCI_2068
Write server-side endpoints for custom repositories [SCI-2068]
|
2018-03-20 14:30:47 +01:00 |
|
mlorb
|
9cf9bf94c0
|
fix merge conflict
|
2018-03-20 14:30:07 +01:00 |
|
mlorb
|
884eef9d07
|
Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118
|
2018-03-20 14:25:59 +01:00 |
|
mlorb
|
e0926ddc3c
|
code refactoring
|
2018-03-20 13:53:11 +01:00 |
|
Oleksii Kriuchykhin
|
acbd40e0d1
|
Remove Power Up button [SCI-2117]
|
2018-03-18 22:12:29 +01:00 |
|
Oleksii Kriuchykhin
|
a105e61d48
|
Remove tutorial [SCI-1860]
|
2018-03-18 13:18:05 +01:00 |
|
Oleksii Kriuchykhin
|
37f675b32a
|
Use larger LinkedIn sign-in button [SCI-2201]
|
2018-03-18 12:18:33 +01:00 |
|
zmagod
|
a9dfcd9681
|
refactor
|
2018-03-16 16:38:59 +01:00 |
|
zmagod
|
311b2dac5a
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142
|
2018-03-16 16:21:47 +01:00 |
|
zmagod
|
86a8afd907
|
refactor
|
2018-03-16 15:56:12 +01:00 |
|
zmagod
|
ee03115361
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095
|
2018-03-16 15:32:40 +01:00 |
|
zmagod
|
1cdba5e0d3
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
|
2018-03-16 11:05:16 +01:00 |
|
zmagod
|
d69754af04
|
implement search on list items dropdown, update, create actions [fixes SCI-2070]
|
2018-03-15 15:43:16 +01:00 |
|
mlorb
|
9de998e85c
|
code left-side menu bar
|
2018-03-14 14:33:34 +01:00 |
|
zmagod
|
a6a25bbe08
|
add floating alert message
|
2018-03-13 16:33:48 +01:00 |
|
zmagod
|
51af74071c
|
remove comments and activity modal
|
2018-03-13 10:52:53 +01:00 |
|
zmagod
|
8fe173e831
|
re-structure top navigation bar
|
2018-03-12 16:27:35 +01:00 |
|
zmagod
|
e218cae453
|
refactor global activities in separate page [fixes SCI-2141]
|
2018-03-12 11:01:23 +01:00 |
|
Zanz2
|
1fc8b2a2b2
|
quick fix un-needed styling
|
2017-12-10 01:45:47 +01:00 |
|
Zanz2
|
d0a9198408
|
Fixed the styling
|
2017-12-10 01:20:08 +01:00 |
|
mlorb
|
cd6799d571
|
Merge pull request #866 from biosistemika/protocols-io-import
Protocols io import
|
2017-11-13 11:53:28 +01:00 |
|
Zanz2
|
4354363215
|
rubocop refactor css
|
2017-11-03 16:46:03 +01:00 |
|
Zanz2
|
ac26b17ddf
|
Rubocop refactor
|
2017-11-03 16:45:15 +01:00 |
|
Oleksii Kriuchykhin
|
631b41cdaa
|
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
|
2017-10-19 11:38:23 +02:00 |
|
Zanz2
|
4051c0b06b
|
Deleted old unused files i spotted on github
|
2017-09-22 13:28:38 +02:00 |
|
Zanz2
|
d85e02730d
|
Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc
|
2017-09-15 12:19:58 +02:00 |
|
Zanz2
|
b7432b336a
|
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
|
2017-09-13 15:15:08 +02:00 |
|
Žan Žagar
|
62350d0d42
|
Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later
|
2017-09-11 16:03:33 +02:00 |
|
Žan Žagar
|
f668f60237
|
dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni
|
2017-09-11 15:22:22 +02:00 |
|
Oleksii Kriuchykhin
|
fc72453a5b
|
Fix hound warning [SCI-1356]
|
2017-06-23 16:19:59 +02:00 |
|
Oleksii Kriuchykhin
|
e038bc58fa
|
Add global search in custom repositories [SCI-1356]
|
2017-06-23 16:12:56 +02:00 |
|
Zmago Devetak
|
cffac82e88
|
Merge pull request #704 from ZmagoD/zd_SCI_1392
fixes bug with long text in parse records modal [fixes SCI-1392]
|
2017-06-22 17:47:15 +02:00 |
|
zmagod
|
a2e1aa5b36
|
fixes bug with long text in parse records modal [fixes SCI-1392]
|
2017-06-22 14:43:01 +02:00 |
|
Mojca Lorber
|
1ba32e19cb
|
allign no. of pages and showing entries per page
|
2017-06-22 14:23:03 +02:00 |
|
mlorb
|
14429a270c
|
Merge pull request #689 from mlorb/ml_sci_1354
Truncate and display text in tooltip in custom repository fields [SCI-1354]
|
2017-06-19 15:50:38 +02:00 |
|
mlorb
|
122ac7971f
|
Merge pull request #692 from mlorb/ml_sci_1348
Fix cog position on repositories page [SCI-1348]
|
2017-06-19 15:16:01 +02:00 |
|
Mojca Lorber
|
f77b1aa4e8
|
retain the same word case in repositories dropdown
|
2017-06-19 10:32:12 +02:00 |
|
Mojca Lorber
|
b6f146f177
|
fix cog position on repositories page
|
2017-06-16 11:54:31 +02:00 |
|