Commit graph

509 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +02:00
aignatov-bio
958ee92db7 Add BMT filters interactions [SCI-5955] (#3478)
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
2021-08-30 10:49:14 +02:00
aignatov-bio
1929959038 Add dropdown for btm filters [SCI-5953] (#3469) 2021-08-30 10:49:14 +02:00
aignatov-bio
7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
aignatov-bio
a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
aignatov-bio
852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486)
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
2021-08-16 10:51:46 +02:00
aignatov-bio
5eb2c4a28b
Fix image extension in empty printers modal [SCI-5971] (#3470) 2021-08-11 11:43:16 +02:00
Martin Artnik
ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
Martin Artnik
123e415a4f Print status backend + FE integration [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio
02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
aignatov-bio
a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
aignatov-bio
8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
aignatov-bio
d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
aignatov-bio
be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447)
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
2021-07-21 21:32:42 +02:00
aignatov-bio
ea424e4a12
Merge pull request #3161 from mlorb/ml-sci-5323
Implement styling for the inventories empty state [SCI-5323]
2021-03-08 11:42:48 +01:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
Oleksii Kriuchykhin
e8b4a30b87 Improve inventory table loading speed [SCI-5509] 2021-02-22 10:34:06 +01:00
aignatov-bio
99c3e1430b Fix shared inventories [SCI-5492] 2021-02-17 15:14:32 +01:00
Mojca Lorber
456d9c713f Implement styling for the inventories empty state 2021-02-15 21:01:31 +01:00
Oleksii Kriuchykhin
6b2a94f045 Add empty repositories index page [SCI-5248] 2021-02-01 15:02:08 +01:00
aignatov-bio
8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108)
* Add sticky toolbar for projects page [SCI-5401]
2021-01-25 15:36:23 +01:00
Urban Rotnik
427b5d7107
Merge pull request #3059 from biosistemika/features/folders
Features/folders into develop
2021-01-08 06:26:44 +01:00
aignatov-bio
ef57489cd9
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
2021-01-06 10:13:10 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
Urban Rotnik
a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +01:00
aignatov-bio
e6e9c84a7c Fix asset link partial in item card 2020-12-03 12:58:54 +01:00
Mojca Lorber
8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio
c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
mlorb
3f44f44cbe
Merge pull request #2711 from mlorb/ml-sci-4810
Hide inventory buttons and fix css of disabled button [SCI-4810]
2020-07-09 15:11:02 +02:00
Miha Mencin
b357d7c0e6
Merge pull request #2719 from urbanrotnik/ur-sci-4806-missing-icon
Add icon before archived items [SCI-4806]
2020-07-09 12:58:06 +02:00
mlorb
d9038e6f7f
Merge branch 'develop' into ml-sci-4810 2020-07-09 11:46:54 +02:00
Urban Rotnik
7661cea379 Add icon before archived items 2020-07-09 11:34:09 +02:00
Miha Mencin
c68aa5c875
Merge pull request #2716 from mlorb/ml-sci-4567
Change title size to h1 [SCI-4567]
2020-07-09 11:19:02 +02:00
mlorb
efbef2c876
Merge pull request #2384 from mlorb/ml-sci-4261
Clean up controllers for manage repository columns [SCI-4261]
2020-07-09 09:18:23 +02:00
Mojca Lorber
f64172f787 Revert repository archived items title 2020-07-09 09:17:02 +02:00
aignatov-bio
b2a42c182b
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository
Small archived repositories fixes [SCI-4844]
2020-07-09 08:56:21 +02:00
aignatov-bio
135ac487d0 Small archived repositories fixes 2020-07-08 13:42:27 +02:00
Mojca Lorber
00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
aignatov-bio
a994c75885
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue
Fix date columns sorting in repositories list [SCI-4801]
2020-07-08 09:30:10 +02:00
aignatov-bio
004a7e3943
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals
Update inventory modals CSS [SCI-4808]
2020-07-08 09:29:02 +02:00
Mojca Lorber
9642e92fdc Hide inventory buttons and fix css of disabled button 2020-07-07 13:53:31 +02:00
aignatov-bio
6352a4ba9b Update inventory modals 2020-07-06 12:47:42 +02:00
aignatov-bio
d226bb5622 Fix date columns sorting in repositories list 2020-07-02 14:35:48 +02:00
Urban Rotnik
1bf8198129 Hide checkbox column when user is not admin 2020-07-02 14:29:18 +02:00
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Oleksii Kriuchykhin
29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +02:00
miha
41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
aignatov-bio
414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository
Add archived_by and archived_on column to columns manage modal [SCI-4784]
2020-06-23 09:10:28 +02:00
aignatov-bio
dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio
6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio
323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio
e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio
8b10d49118 Clean up CSS 2020-06-18 14:08:24 +02:00
aignatov-bio
a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper
Add archiving column to datatable helper [SCI-4692]
2020-06-15 15:35:19 +02:00
mlorb
0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows
Archiving & restoring rows [SCI-4706]
2020-06-11 16:41:53 +02:00
aignatov-bio
db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik
c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
aignatov-bio
2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
aignatov-bio
66a77d8de9 Add sidebar reload on view change 2020-06-04 18:41:45 +02:00
aignatov-bio
012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
aignatov-bio
f963608996 Add I18n and tests 2020-06-01 14:34:04 +02:00
aignatov-bio
aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
Mojca Lorber
285280827a Refactor repository column base controller 2020-05-28 12:18:46 +02:00
Mojca Lorber
c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
aignatov-bio
d16930e987 Add private tasks to assigned task list 2020-05-20 17:23:48 +02:00
Oleksii Kriuchykhin
c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
Urban Rotnik
760c2fba8f
Merge pull request #2523 from urbanrotnik/ur-sci-4549-sidebar-fix
Fix icon position and hover effect in repositories sidebar [SCI-4549]
2020-04-30 09:32:20 +02:00
Urban Rotnik
8fa024ed10 Remove all tooltips from HTML 2020-04-28 12:30:43 +02:00
Urban Rotnik
73e5168db6 Fix icon position and hover efect in repositories sidebar 2020-04-24 14:51:32 +02:00
Oleksii Kriuchykhin
3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Alex Kriuchykhin
92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state
Refactor sidebar [SCI-4380]
2020-03-30 09:56:51 +02:00
aignatov-bio
c39c3e852c Add class to no-inventories placeholder 2020-03-17 14:38:11 +01:00
aignatov-bio
6dcb8be849 Merge branch 'develop' into ai-sci-4380-saving-navigation-state 2020-02-28 14:14:08 +01:00
aignatov-bio
8b273acaca Update all sidebars 2020-02-28 14:03:08 +01:00
aignatov-bio
630412c18a Change button style for new inventory 2020-02-27 12:11:38 +01:00
aignatov-bio
5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
Mojca Lorber
509e197f64 Change repository name and team name to h2 2020-02-11 13:18:33 +01:00
Mojca Lorber
2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
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
Urban Rotnik
cd14fe01f7 Rename div 2020-02-02 18:52:40 +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
875515121b Fix Share button in repositories 2020-01-29 14:15:47 +01:00
Urban Rotnik
765a577669 Ellipsis with css for Sidebar 2020-01-29 13:22:35 +01:00
aignatov-bio
0ce52aae94 Add container for repository filters 2020-01-28 14:11:11 +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
Urban Rotnik
d7761622ba Hide Edit/Delete buttons if user do not has permissions 2020-01-25 12:36:36 +01:00
Mojca Lorber
3af2f4af19 Change to new style checkboxes on share inventory modal 2020-01-24 15:43:13 +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
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
mlorb
9747a72567
Merge pull request #2338 from mlorb/ml-sci-4132-v2
Change html structure for flash msg, change columns buttons [SCI-4132]
2020-01-20 14:36:33 +01:00
Mojca Lorber
772118d246 change html structure for flash msg, change columns buttons 2020-01-20 14:02:42 +01:00
Urban Rotnik
fc29641c2b Hide manage column action buttons on Task page 2020-01-17 17:29:26 +01:00
aignatov-bio
b7fe8b71c1 Disable column manage button in edit mode 2020-01-16 15:59:57 +01:00
mlorb
e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
Mojca Lorber
16226640d5 changes upon Antons review 2020-01-14 16:46:48 +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
aignatov-bio
b37d8f1275 Update layout for repository 2020-01-13 14:46:43 +01:00
Alex Kriuchykhin
f1babb2237
Merge pull request #2279 from okriuchykhin/ok_SCI_4000
Fix sidebar update for inline editing [SCI-4000]
2020-01-10 10:34:27 +01:00
aignatov-bio
8a647ee003 Fix error on opening inventory 2020-01-09 15:32:28 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Oleksii Kriuchykhin
16b591b110 Fix sidebar update for inline editing [SCI-4000] 2020-01-06 16:07:23 +01:00
Urban Rotnik
400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
Urban Rotnik
2a63854123 Edit and new renderers for DateTime columns 2019-12-20 14:55:11 +01:00
Urban Rotnik
7c71159303 Add Inputmask to webpack 2019-12-20 14:50:44 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
aignatov-bio
7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Urban Rotnik
3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Oleksii Kriuchykhin
3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
Miha Mencin
a328c4ad56 fix CR comments 2019-11-25 17:40:29 +01:00
Miha Mencin
04a6645cfc Separate view/edit/modify permissions SCI-4058 2019-11-20 17:12:47 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01: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
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +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
aignatov-bio
d3ccdbd83e
Create copy permission (#2017) 2019-08-29 13:39:22 +02:00
aignatov-bio
4d20cd7d55
Fix copy inventory permission (#2016) 2019-08-26 14:48:38 +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
66326d90e5
Fix shared icon show/hidden (#2014) 2019-08-26 11:24:22 +02:00
Miha Mencin
9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
Luka Murn
c5c47916d2 Change localization key to not be called custom_field 2019-08-23 16:06:30 +02:00
aignatov-bio
96e132c62e
Hide share button for users with one team (#2005) 2019-08-23 11:29:03 +02:00
Mojca Lorber
50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio
0810699770
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder
2019-08-23 10:57:02 +02:00
aignatov-bio
d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio
5e3f1d59f5
Fix inventory rows import (#1997) 2019-08-21 15:32:45 +02:00
aignatov-bio
0b85dcbead
Fix long inventory names (#1999) 2019-08-21 10:39:48 +02:00
Anton Ignatov
a2c50cbe38 Add new permission check for share button 2019-08-20 15:08:53 +02:00
Mojca Lorber
530d09df64 add i-shared inventory icon 2019-08-19 15:43:55 +02:00
aignatov-bio
58d9be480f
Remove rename button from dropdown (#1994) 2019-08-19 14:29:38 +02:00
aignatov-bio
a505ef2462
Fix error in inventories for new teams [SCI-3788] (#1992)
* Fix error in inventories for new teams

* Replace with current team
2019-08-19 14:01:48 +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
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
Urban Rotnik
0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +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
23d7d117e9 Remove Repository's team from sharring list 2019-08-09 14:15:50 +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
26bd81621f Add new icons also to the inventories list in navigation 2019-08-09 14:13:02 +02:00
Mojca Lorber
7e9be932f3 Make scope for repositories accessible by teams and simplify read permission 2019-08-09 14:13:00 +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
Urban Rotnik
077369d960 Update permissions for Repositories 2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin
ccf76b8531 Move repository_datatable to JS file [SCI-3679] 2019-07-26 13:00:25 +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
Oleksii Kriuchykhin
ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
Oleksii Kriuchykhin
d5c07fd22a Improve rendering speed of inventory table [SCI-2910] 2018-12-13 16:17:22 +01:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin
3aceb12f03 Fix delete button in inventories [SCI-2594] 2018-07-08 21:59:02 +02:00
zmagod
eb75f6c03d fixes bug with checkAvailableColumns function [fixes SCI-2578] 2018-06-29 10:28:46 +02:00
zmagod
2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +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
Luka Murn
eb29c50379 Fix asset link preview, fix inventory item modal window styling 2018-06-08 09:01:59 +02:00
zmagod
c0b659a252 adds data-hook to repositories/show page 2018-06-07 10:50:48 +02:00
Luka Murn
c07fa5adc2 Update blank page for projects 2018-06-06 17:23:22 +02:00
mlorb
f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
mlorb
64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
mlorb
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +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
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
078645332b add permission to column management [fixes SCI-2297] 2018-04-20 09:34:12 +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
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
zmagod
a948710576 fixes alert label [fixes SCI-2239] 2018-04-19 15:51:36 +02:00
mlorb
c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
Zmago Devetak
a0f549e935
Merge pull request #1093 from ZmagoD/zd_SCI_2296
hides the create new inventory button for non admin users [fixes SCI-…
2018-04-16 16:18:15 +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
zmagod
0adc06b1a1 adds edit repository item permission to normal user [fixes SCI-2297] 2018-04-13 13:11:29 +02:00
Zmago Devetak
f5127bad99
Merge pull request #1088 from ZmagoD/zd_SCI_2290
remove catched views [fixes SCI-2290]
2018-04-13 08:24:28 +02:00
zmagod
f2c314cc85 fix indentation 2018-04-12 17:12:45 +02:00
zmagod
d084998906 remove unneeded label in destroy repository record modal [fixes SCI-2292] 2018-04-12 15:00:41 +02:00
zmagod
5f5829bbe4 fix indentation 2018-04-12 14:49:51 +02:00
zmagod
123f3b796b remove catched views [fixes SCI-2290] 2018-04-12 14:48:14 +02:00
zmagod
b4deb232c0 rename variable: not_in_repository => display_image_tag 2018-04-12 13:40:17 +02:00
zmagod
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod
233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
zmagod
ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19:53 +02:00
Zmago Devetak
eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076
add asset field preview/sort/search in repository table [fixes SCI-2076]
2018-04-09 14:29:45 +02:00
zmagod
b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +02:00
zmagod
afc2a35557 move import export to dropdown 2018-04-05 09:32:34 +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
zmagod
d47337fbf3 remove destroy column modal 2018-04-05 08:51:21 +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
525a1c15ca fixes hound 2018-04-04 16:40:07 +02:00
mlorb
58433f4218 fix merge bananas 2018-04-04 16:36:26 +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
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
Oleksii Kriuchykhin
cc855cda86 Fix translations [SCI-2205] 2018-03-30 12:48:34 +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
7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +02:00
okriuchykhin
145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin
fac5875cfd Add repository name to record info modal [SCI-2205] 2018-03-26 16:18:09 +02:00
okriuchykhin
784a4723cc
Merge pull request #1056 from okriuchykhin/ok_SCI_2251
Update turbolinks and fix repository table init [SCI-2251]
2018-03-26 14:23:30 +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
Oleksii Kriuchykhin
83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
mlorb
5589b27883 improve message for deleting sample/report items 2018-03-23 14:39:09 +01:00
Oleksii Kriuchykhin
36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
zmagod
81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
zmagod
62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod
1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +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
zmagod
dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin
cd9260f439 Hide delete button for guest users in repository [SCI-2163] 2018-03-09 16:19:36 +01:00
Oleksii Kriuchykhin
bd9f5c1cda Fix manage repository permissions [SCI-2136] 2018-03-07 13:41:57 +01:00
zmagod
2b55cd7090 rename variables 2018-03-02 14:14:27 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
Matej Zrimšek
5bda53eebf Overall refactoring of all canaid permissions and code related to their calls. 2018-02-16 10:54:06 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
okriuchykhin
38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939
Fix repository records import [SCI-1939]
2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin
86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin
a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00