Luka Murn
9632d1cd01
Set tooltips initialization to comply with turbolinks
...
Also add custom styling options as another data attribute.
2018-10-02 13:49:19 +02:00
Luka Murn
c12f77d1d1
Fix styling (ESLint) on tooltip_helper.js
2018-10-02 11:25:51 +02:00
Oleksii Kriuchykhin
492a5de19e
Add Projects view - list/table view [SCI-2731]
2018-10-01 15:39:42 +02:00
Jure Grabnar
553ac4c360
Refactor code according to PR review
...
PR review: https://github.com/biosistemika/scinote-web/pull/1304
Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
2018-09-30 16:37:18 +02:00
Zanz2
ada98e9eaf
Merge pull request #1289 from Zanz2/step_save_table_too_long_bug_sci2719
...
Fixed bug with table name of step not being length validated [SCI-2719]
2018-09-28 14:37:08 +02:00
Zanz2
16f9728a05
fixed to not use gon gem
2018-09-28 14:26:05 +02:00
Zanz2
c6936bc71e
fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem
2018-09-28 13:13:25 +02:00
Oleksii Kriuchykhin
2508394924
Refactor Projects view - cards view [SCI-2730]
2018-09-27 10:43:44 +02:00
Zanz2
2e0c40ed45
fixed merge
2018-09-26 12:20:13 +02:00
Zanz2
c8ed808920
merged with core-api
2018-09-26 12:17:49 +02:00
Zanz2
1a512698e8
Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2
...
( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]
2018-09-26 12:04:09 +02:00
Alex Kriuchykhin
112343e65d
Merge pull request #1311 from okriuchykhin/ok_SCI_2738
...
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
2018-09-25 11:49:19 +02:00
Oleksii Kriuchykhin
f8388d4bcd
Merge branch 'ok_SCI_2729' into ok_SCI_2730
2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin
e06684b7cf
Few fixes after review [SCI-2718]
2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin
ab3aeac26b
Merge latest core-api branch [SCI-2718]
2018-09-24 16:49:27 +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
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663
...
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
2018-09-24 16:23:28 +02:00
Zanz2
87d2b0db14
fixed accordign to pr review
2018-09-24 15:57:31 +02:00
Zanz2
8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667
...
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
2018-09-24 15:31:47 +02:00
Zanz2
e5b7d68031
this should fix travis ci
2018-09-24 13:33:44 +02:00
Zanz2
1e8442e22e
fixed pull request review, forgot some small thing
2018-09-24 12:50:11 +02:00
Zanz2
1a9890ee0f
fixed pull request review
2018-09-24 12:48:53 +02:00
Alex Kriuchykhin
b38e85c282
Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2
...
Fix CREATE inventory endpoint [SCI-2693]
2018-09-24 10:51:13 +02:00
Jure Grabnar
872a1211bb
Format according to Houndbot #3
2018-09-23 18:58:56 +02:00
Jure Grabnar
d6f7ec2604
Format according to houndbot #2
2018-09-23 18:53:43 +02:00
Jure Grabnar
869967361c
Fix according to Houndbot
2018-09-23 18:48:44 +02:00
Jure Grabnar
7877d559a3
Update email/notification, type: deliver
...
Closes [SCI-2643], [SCI-2644].
2018-09-23 18:45:13 +02:00
Jure Grabnar
59169f882d
Add permission check for every project
2018-09-23 14:34:21 +02:00
Jure Grabnar
6106904460
Format according to Houndbot #5
2018-09-23 12:07:53 +02:00
Jure Grabnar
90b220ddda
Format according to Houndbot #4
2018-09-23 12:06:06 +02:00
Jure Grabnar
970341e7d7
Format according to Houndbot #3
2018-09-23 11:56:23 +02:00
Jure Grabnar
a3d7d37081
Format according to Hound bot #2
2018-09-23 11:30:20 +02:00
Zanz2
b536aa6f3e
Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672
...
Fixed blue block in dropdown, now its a full line [SCI-2672]
2018-09-23 11:27:00 +02:00
Jure Grabnar
64a6ed7ffe
Format according to houndbot
2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin
7f7ece2be0
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin
84428b37c2
Add project view JSON endpoints [SCI-2728]
2018-09-21 10:39:20 +02:00
Luka Murn
5d6881bae1
Merge pull request #1309 from biosistemika/release-1.14.5
...
Merge release-1.14.5 into master
2018-09-20 08:53:51 +02:00
Luka Murn
32e068f298
Merge pull request #1307 from biosistemika/release-1.14.4
...
Merge release-1.14.4 into release-1.14.5
2018-09-19 15:29:57 +02:00
Oleksii Kriuchykhin
872a48082a
Remove Samples from search controller [SCI-2739]
2018-09-18 15:03:19 +02:00
Oleksii Kriuchykhin
4ee9eb3134
Improve search speed on files and inventories [SCI-2739]
2018-09-17 17:06:47 +02:00
Jure Grabnar
d783c34d33
Clean some minor artefacts
2018-09-16 23:52:36 +02:00
Jure Grabnar
d40096f663
Remove typo and add hyperlink to inventories
2018-09-16 23:45:38 +02:00
Jure Grabnar
f8b1db7f72
Fix repository export and relative hyperlinks
2018-09-16 23:01:44 +02:00
Zanz2
5b955da74c
makes tooltip behaviour more reliable and less erratic
2018-09-16 21:34:36 +02:00
Jure Grabnar
06eaafd118
Suffix should append to basename first and then extension
2018-09-16 20:57:37 +02:00
Jure Grabnar
449aa12070
Refactor TeamZipExport code (move it into special file)
2018-09-16 20:28:26 +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
Oleksii Kriuchykhin
49e788a9ad
Mergre latest core-api [SCI-2515]
2018-09-14 10:24:05 +02:00
Luka Murn
f9d771d01a
Add minor comment
2018-09-13 14:50:00 +02:00
Luka Murn
0ddc3e0968
Merge pull request #1303 from biosistemika/release-1.14.4
...
Merge release-1.14.4 into master
2018-09-13 14:47:17 +02:00
Oleksii Kriuchykhin
acc00ff3b9
Add CREATE Result endpoint: Create Text result [SCI-2718]
2018-09-13 13:38:11 +02:00
Zanz2
e47acfb4a1
Fixed attribute names
2018-09-13 11:57:31 +02:00
Zanz2
81115f411a
Renaming my module attribute to tasks
2018-09-13 11:46:25 +02:00
Zanz2
46d33d28a3
standardized serializers by removing specified attributes
2018-09-13 11:38:29 +02:00
Zanz2
8ac1445ace
Fixed hound
2018-09-13 11:37:07 +02:00
Zanz2
7f704c07e3
Created base endpoints for projects and related models
2018-09-13 11:37:07 +02:00
Zanz2
dace81f724
created base projects endpoint
2018-09-13 11:37:07 +02:00
Zanz2
a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629
...
Fixed disabled export button after new inventory item save [SCI-2629]
2018-09-13 11:35:07 +02:00
Zanz2
68385b36cc
removed attributes
2018-09-13 11:20:30 +02:00
Zanz2
23f74a5b9b
standardized serializers by removing specified attributes
2018-09-13 11:19:54 +02:00
Zanz2
8a925008f9
fixed hound
2018-09-13 11:18:49 +02:00
Zanz2
bd49ea56c5
Added results endpoint
2018-09-13 11:16:34 +02:00
Zanz2
426bd129cc
Added task inputs and outputs functionality
2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin
9d9a5d07d8
Fix CREATE inventory endpoint [SCI-2693]
2018-09-13 11:08:58 +02:00
Zanz2
2519a010f6
Created new controllers and serializers for nested task related attributes
2018-09-13 11:04:52 +02:00
Zanz2
765ee25853
Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666
...
Created API endpoints for experiments and related data [SCI-2666]
2018-09-13 10:49:49 +02:00
Zanz2
1159ce519c
Review changes
2018-09-13 09:25:16 +02:00
Luka Murn
99c156de94
Fix (hopefully) the TinyMCE files from being cached
...
Closes SCI-2717.
2018-09-12 15:28:21 +02:00
Luka Murn
0b68a670c2
Fix the inventory_columns_controller#create action
...
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
2018-09-12 13:44:10 +02:00
Zanz2
ae3c19ced5
removing attributes
2018-09-11 15:35:03 +02:00
Zanz2
4c2c92445c
fixed oversight, added paging to connections
2018-09-11 13:07:28 +02:00
Zanz2
34f408b552
refactored serializers, removed attributes
2018-09-11 10:34:05 +02:00
Zanz2
7cb50145a0
Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621
...
Fixed table add and remove crash [SCI-2621]
2018-09-11 09:37:07 +02:00
Zanz2
0efaf827b8
Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2
...
Replaced image icon with paperclip on scinote [SCI-2712]
2018-09-11 09:36:47 +02:00
Zanz2
a0c6a0c407
changed name of data attribute
2018-09-07 15:33:38 +02:00
Zanz2
7496e3749b
fixed types to plural for naming convention
2018-09-07 13:39:00 +02:00
Zanz2
e64aee5db0
Completed the functionality for experiments and related endpoints
2018-09-07 11:58:02 +02:00
Zanz2
1589cfb1b2
saving work
2018-09-06 15:38:48 +02:00
Luka Murn
cbb5bda7fe
Hound is love, Hound is life
2018-09-05 16:42:15 +02:00
Luka Murn
586a442abc
Refactor the settings page, rename setting to tooltips_enabled
2018-09-05 16:36:32 +02:00
Zanz2
f9d55f913a
trying to fix display of my modules data
2018-09-05 12:54:08 +02:00
Zanz2
5ada21725f
inital experiments api functionality
2018-09-05 09:55:04 +02:00
Zanz2
384371802c
fixes travis
2018-08-31 13:12:34 +02:00
Zanz2
1bed2c2a3c
Partially fixed according to pull request review, added comments to code review
2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663
...
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
2018-08-31 11:42:26 +02:00
Zanz2
7d093fa11d
Fixed the issue, tested for all 3 reported scenarios
2018-08-31 11:18:18 +02:00
Zanz2
67f4555584
Fixed the issue, tested all 3 scenarios
2018-08-31 11:04:20 +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
Jure Grabnar
93bd461a83
Generate table.csv
2018-08-29 00:31:11 +02:00
Jure Grabnar
01d48cf679
Add suffixes to all names
2018-08-29 00:21:17 +02:00
Jure Grabnar
4b0357b392
Add export of Inventories and their assets
2018-08-28 23:22:55 +02:00
Zanz2
728b1fe491
Reverted deleted lines by accident
2018-08-28 14:51:05 +02:00
Zanz2
b26530a02f
Found a new, and more elegant fix inside controller with Luka
2018-08-28 14:48:23 +02:00
Zanz2
15c124f3fd
replaced image icon with paperclip, to represent files, removed all image icons
2018-08-27 13:07:18 +02:00
Luka Murn
50f6bd24e1
Merge pull request #1283 from Ducz0r/lm-sci-2707-fix
...
Fix bootstrap-select to work with turbolinks 5.x [SCI-2707]
2018-08-24 17:24:35 +02:00
Luka Murn
b71c5d14c6
Fix bootstrap-select to work with turbolinks 5.x
...
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.
Closes SCI-2707.
2018-08-24 17:11:59 +02:00
Alex Kriuchykhin
18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604
...
Improve health check endpoint [SCI-2604]
2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin
4d49671ae8
Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695]
2018-08-24 16:41:26 +02:00
Oleksii Kriuchykhin
c86063f79e
Fix failing tests [SCI-2688]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
c8efa4bffc
Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
5488fc66fc
Refactor JSON API mime type registration [SCI-2687]
2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
490376513b
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:36:19 +02:00
Oleksii Kriuchykhin
c8abb3d9b8
Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]
2018-08-24 15:27:59 +02:00
Alex Kriuchykhin
eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613
...
Add READ user endpoint [SCI-2613]
2018-08-24 15:23:05 +02:00
Alex Kriuchykhin
427ab5fb41
Merge pull request #1264 from okriuchykhin/ok_SCI_2615
...
Add GET inventory columns API endpoint [SCI-2615]
2018-08-24 15:22:35 +02:00
Alex Kriuchykhin
1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614
...
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-24 15:22:13 +02:00
Oleksii Kriuchykhin
0322316d74
Make API V1 togglable [SCI-2686]
2018-08-24 12:11:28 +02:00
Alex Kriuchykhin
151d1cf44d
Merge pull request #1270 from okriuchykhin/ok_SCI_2651
...
Refactor invite users modal initialization [SCI-2651]
2018-08-23 14:34:42 +02:00
Alex Kriuchykhin
0ca9972905
Merge pull request #1271 from okriuchykhin/ok_SCI_2628
...
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-22 14:21:18 +02:00
Alex Kriuchykhin
75a48291e1
Merge pull request #1272 from okriuchykhin/ok_SCI_2654
...
Fix report elements sorting [SCI-2654]
2018-08-22 14:20:54 +02:00
Jure Grabnar
295c6a9432
Add export all functionality (basic skeleton)
2018-08-21 21:07:45 +02:00
Luka Murn
92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634
...
fix editing of inventory items of hidden columns [SCI-2634]
2018-08-21 16:59:37 +02:00
Luka Murn
92a4a54ae7
Slighty change the parameter parsing of removed file cells
2018-08-21 16:46:47 +02:00
Zanz2
6e4730619f
Fixed the bug, disabled class in dropdown menu when there was no need
2018-08-21 14:29:34 +02:00
Oleksii Kriuchykhin
a8013118d4
Add READ user endpoint [SCI-2613]
2018-08-21 13:56:14 +02:00
Zanz2
d8fb47ff4d
Merge pull request #1267 from Zanz2/zz_refactor_icons_sci_2445_v2
...
Changed some icons to fontawesome [SCI-2445]
2018-08-21 13:33:12 +02:00
Zanz2
ab3b15e13e
Found the bug and fixed it
2018-08-21 13:26:16 +02:00
Zanz2
4e55fdc9b5
Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662
2018-08-21 12:09:05 +02:00
Zanz2
601335a807
Fixed non .js errors hound
2018-08-21 12:08:14 +02:00
Zanz2
0ed62b7375
refactored according to PR review
2018-08-21 11:35:22 +02:00
Zanz2
817d09ad5f
fixed hound
2018-08-21 11:29:38 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
2018-08-21 11:27:01 +02:00
Zanz2
36cca3d6aa
Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax
2018-08-21 11:11:25 +02:00
Zanz2
880582de25
Added just a data attribute, so i dont have to add it on other branch
2018-08-21 09:59:49 +02:00
Zanz2
9a482eab2e
Checkbox now gets styled properly and defaults to true
2018-08-21 09:02:54 +02:00
Zanz2
beb1d02914
Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always
2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin
62d99a4372
Fix report elements sorting [SCI-2654]
2018-08-20 14:46:23 +02:00
Oleksii Kriuchykhin
3a5238f6f3
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-20 14:26:42 +02:00
Zanz2
91f112dc38
Saving minor changes, deleted comments, stuck at drag n drop
2018-08-20 13:45:43 +02:00
Oleksii Kriuchykhin
6795b08a91
Refactor invite users modal initialization [SCI-2651]
2018-08-20 13:13:34 +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
1a57289009
Improve health check endpoint [SCI-2604]
2018-08-17 16:13:21 +02:00
Zanz2
8c492e1491
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin
ecde634a2c
Add OAuth2 provider [SCI-2515]
2018-08-17 13:17:59 +02:00
Zanz2
e1cadfc75e
saving work, removed testing buttons
2018-08-17 11:52:10 +02:00
Zanz2
637c7dfb19
modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic
2018-08-17 11:33:44 +02:00
Alex Kriuchykhin
422baaf64a
Merge pull request #1258 from okriuchykhin/ok_SCI_2619
...
Add team deletion service [SCI-2619]
2018-08-17 10:56:11 +02:00
Zanz2
a09834db6a
testing, made new popover designs
2018-08-16 16:10:19 +02:00
Zanz2
d2373980d4
Testing out new popover
2018-08-16 15:07:59 +02:00
Zanz2
9fd02e71c9
initial popover/tooltip config
2018-08-16 13:04:42 +02:00
Zanz2
dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
2018-08-14 13:33:43 +02:00
Zanz2
45a4c1c598
changed the icons as per last comment in jira issue
2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin
3f7590bb57
Rename type for inventories and add mimetype for JSON API [SCI-2614][SCI-2616][SCI-2617]
2018-08-10 17:01:14 +02:00
Oleksii Kriuchykhin
ca6fc84ae2
Remove duplicated task outputs deletion [SCI-2619]
2018-08-10 16:43:40 +02:00
Zanz2
27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621
...
Fixes duplicate checkbox entries in activity log [SCI-1621]
2018-08-09 11:50:34 +02:00
Oleksii Kriuchykhin
ef7e0ac489
Add GET inventory columns API endpoint [SCI-2615]
2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin
5efcacbf3d
Rename type for rows and cells serializers [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:15:08 +02:00
Oleksii Kriuchykhin
6c59e1e159
Fix failing tests [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
4df9a4c9ca
Fix code style warnings [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611
...
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-08-08 16:59:42 +02:00
mlorb
a6dd577b4e
fix time zone selector
2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin
298b866df4
Fix failing tests [SCI-2611][SCI-2612]
2018-08-07 14:58:02 +02:00
mlorb
f52ccfd606
fix editing of inventory items of hidden columns
2018-08-07 11:47:26 +02:00
okriuchykhin
29f0f2afeb
Merge pull request #1257 from okriuchykhin/ok_SCI_2609
...
Refactor tasks tree API endpoint [SCI-2609]
2018-08-02 17:10:55 +02:00
okriuchykhin
bb5d029c30
Merge pull request #1251 from okriuchykhin/ok_SCI_2253
...
Upgrade to Turbolinks 5 [SCI-2253]
2018-08-02 14:43:19 +02:00
Oleksii Kriuchykhin
8f5d30ad1f
Fix load protocol modal [SCI-2253]
2018-08-02 14:35:19 +02:00
okriuchykhin
3503eb775b
Merge pull request #1254 from okriuchykhin/ok_SCI_2601
...
Fix files search results display [SCI-2601]
2018-08-02 11:53:02 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608
...
Adds API authentication with Azure AD [SCI-2608]
2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
38c36ab798
Fix modals handling with Turbolinks [SCI-2253]
2018-08-02 11:25:14 +02:00
okriuchykhin
6c49ecfd4c
Merge pull request #1250 from okriuchykhin/team_migration_fix
...
Fix team import service
2018-08-01 15:01:43 +02:00
okriuchykhin
53c287224b
Merge pull request #1247 from ZmagoD/zd_SCI_2489
...
move FirstTimeDataGenerator helper from applictaion controller [SCI-2489]
2018-07-31 14:33:51 +02:00
Oleksii Kriuchykhin
1c3f1a1a6c
Fix fontawesome package paths [SCI-2253]
2018-07-31 13:52:21 +02:00
Oleksii Kriuchykhin
22e12d8fc3
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
26b0bd9e11
Refactor tasks tree API endpoint [SCI-2609]
2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin
5c999300b5
Fix avatar upload validators [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
812a3dcf7d
Fix user profile edit form [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
10b86a9d05
Add data hook to settings/team page [SCI-2253]
2018-07-27 17:26:46 +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
bc1cd39229
Add team deletion service [SCI-2619]
2018-07-27 13:34:13 +02:00
Oleksii Kriuchykhin
563005cf89
Fix files search results display [SCI-2601]
2018-07-26 09:55:18 +02:00
Oleksii Kriuchykhin
0e372af729
Adds API authentication with Azure AD [SCI-2608]
2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin
3e7fc6720c
Fix team import service
2018-07-20 16:10:45 +02:00
Zanz2
c6ef14290a
Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again
2018-07-17 11:41:42 +02:00
Zanz2
887ddbfce3
Merge pull request #1229 from Zanz2/unify_match_case_sci1324
...
Fix protocol names are case insensitive unique [SCI-1324]
2018-07-17 08:22:03 +02:00
Luka Murn
f67b8d05c7
Merge pull request #1225 from okriuchykhin/ok_SCI_2534
...
Fix rendering permissions of inventory annotations [SCI-2534]
2018-07-13 15:18:59 +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
Luka Murn
de29ab1b11
Merge pull request #1234 from ZmagoD/zd_SCI_2581
...
adds missing js in experiment canvas view [fixes SCI-2581]
2018-07-13 14:54:59 +02:00
Luka Murn
752fb8dcd8
Merge pull request #1238 from ZmagoD/zd_SCI_2511
...
fixes smart annotation serch queries/dropdown item picker [fixes SCI-…
2018-07-13 14:54:42 +02:00
Luka Murn
13aab686b1
Merge pull request #1242 from ZmagoD/zd_SCI_2492
...
adds the ability to scroll to the active element in the navigation si…
2018-07-13 14:54:30 +02:00
Luka Murn
9b2f00cd5d
Merge pull request #1245 from ZmagoD/zd_SCI_2600
...
sanitizes the report name on repors index page [fixes SCI-2600]
2018-07-13 14:54:18 +02:00
zmagod
29e0ecbc89
move FirstTimeDataGenerator helper from applictaion controller
2018-07-11 11:19:39 +02:00
Zmago Devetak
5a1615825d
removes unneeded comment
2018-07-11 09:29:10 +02:00
zmagod
8fe1977ca8
adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334]
2018-07-10 15:34:07 +02:00
zmagod
a7e47faa61
sanitizes the report name on repors index page [fixes SCI-2600]
2018-07-10 10:58:39 +02:00
zmagod
1491c61d51
trim long file names [fixes SCI-2593]
2018-07-09 17:00:47 +02:00
zmagod
62d4796741
adds the ability to scroll to the active element in the navigation sidebar on page load [fixes SCI-2492]
2018-07-09 15:40:52 +02:00
Zmago Devetak
a6a395e394
Merge pull request #1240 from ZmagoD/zd_SCI_2593
...
fixes css for new repository item field field [fixes SCI-2593]
2018-07-09 13:15:15 +02:00
zmagod
10d20a6555
fixes datatable header on add new item action
2018-07-09 13:12:48 +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
Oleksii Kriuchykhin
3aceb12f03
Fix delete button in inventories [SCI-2594]
2018-07-08 21:59:02 +02:00
zmagod
e654725d9e
fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]
2018-07-06 14:26:20 +02:00
Zmago Devetak
00ed339520
Merge pull request #1233 from ZmagoD/zd_SCI_2589
...
fixes bug with xslx files with numeric values [fixes SCI-2589]
2018-07-06 11:08:27 +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
Zmago Devetak
6b4d5c1562
Merge pull request #1236 from ZmagoD/zd_SCI_2592
...
fixes file name label in repository file field [fixes SCI-2592]
2018-07-06 10:47:13 +02:00
Luka Murn
95b832800f
Merge pull request #1228 from okriuchykhin/ok_SCI_2585
...
Fix inventory cell copy with file attached [SCI-2585]
2018-07-06 10:45:44 +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
Oleksii Kriuchykhin
a169639b3c
Fix uploaded file max size validation in JS [SCI-2590]
2018-07-05 15:23:26 +02:00
zmagod
185657c626
adds missing js in experiment canvas view [fixes SCI-2581]
2018-07-05 14:36:54 +02:00
zmagod
c0d276ebee
fixes bug with xslx files with numeric values [fixes SCI-2589]
2018-07-05 14:08:03 +02:00
zmagod
fdedfec7d3
fixes bug with bootstrap-select
2018-07-04 17:38:16 +02:00
Zmago Devetak
eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546
...
Refactor inline row editing in repository
2018-07-04 15:28:08 +02:00
zmagod
5b9b86a2d4
fixes per @Ducz0r 's request
2018-07-04 15:23:41 +02:00
zmagod
c9dd8b356a
fixes locale, fixes custom file upload style
2018-07-04 13:43:45 +02:00
zmagod
43903080ce
code style fixes
2018-07-04 12:42:28 +02:00
zmagod
3eef4f87bf
fixes hound alerts
2018-07-03 16:18:44 +02:00
zmagod
8b86891177
fixes file destroy button [fixes SCI-2546]
2018-07-03 15:25:37 +02:00
zmagod
28bac14667
first working version of the edit form object
2018-07-03 12:57:39 +02:00
zmagod
c93e00b8c2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546
2018-07-03 09:13:54 +02:00
Zanz2
8e42dba7de
Found the fix
2018-07-03 08:20:56 +02:00
ZmagoD
1e66d25578
refactor list item dropdown
2018-07-02 17:05:52 +02:00
Oleksii Kriuchykhin
42ce72170c
Fix inventory cell copy with file attached [SCI-2585]
2018-07-02 12:58:49 +02:00
ZmagoD
23de3abd61
Fixes repository items edit action, adds additional event listener for file upload
2018-06-29 16:59:26 +02:00
nbernot
7aacc2b4a2
extract repository_item html form creation in to a separate 'class'
2018-06-29 14:28:06 +02:00
zmagod
0dbd2dc877
fixes typo
2018-06-29 10:29:39 +02:00
zmagod
eb75f6c03d
fixes bug with checkAvailableColumns function [fixes SCI-2578]
2018-06-29 10:28:46 +02:00
Oleksii Kriuchykhin
6660b240c8
Fix rendering permissions of inventory annotations [SCI-2534]
2018-06-28 15:30:32 +02:00
okriuchykhin
10554fecb4
Merge pull request #1223 from ZmagoD/zd_SCI_2566
...
fixes tagsinput text-area on long input [fixes SCI-2566]
2018-06-28 10:50:12 +02:00
Zmago Devetak
54a17e0574
Merge pull request #1209 from ZmagoD/zd_SCI_2165
...
Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]
2018-06-27 15:31:27 +02:00
Zmago Devetak
29c379dbae
add rep_item to update_annotation function
2018-06-27 15:17:02 +02:00
Zmago Devetak
7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415
...
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-26 18:43:16 +02:00
Luka Murn
9637af51e6
Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout
...
Fix the sign in halt layout
2018-06-26 17:51:18 +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
52f7d4075d
Merge pull request #1218 from mlorb/ml-sci-2406
...
Fix firefox bug with browse buttons position [SCI-2406]
2018-06-19 14:58:46 +02:00
Oleksii Kriuchykhin
c0232d9eb2
Add extend for task child elements in reports [SCI-2377]
2018-06-19 14:34:36 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
mlorb
0792ce46af
fix firefox bug with browse buttons position
2018-06-19 13:39:03 +02:00
zmagod
d68ae63c40
adds repository_items to smart annotation import
2018-06-19 11:58:22 +02:00
Zmago Devetak
16bce8de60
Merge pull request #1215 from ZmagoD/zd_SCI_2294
...
removes duplicated keywords [fixes SCI-2294]
2018-06-18 16:36:09 +02:00
zmagod
fbcc788597
fixes per @duczOr request
2018-06-18 14:00:49 +02:00
zmagod
5f1489a100
fix columns check [fixes SCI-2408]
2018-06-18 13:36:56 +02:00
Zmago Devetak
cb7023c18e
Merge pull request #1214 from ZmagoD/zd_SCI_2410
...
disable buttons on new/edit repository_item action [fixes SCI-2410]
2018-06-18 13:03:11 +02:00
zmagod
ed39294733
removes duplicated keywords [fixes SCI-2294]
2018-06-18 12:15:52 +02:00
zmagod
2f141e9217
disable buttons on new/edit repository_item action [fixes SCI-2410]
2018-06-15 11:37:01 +02:00
zmagod
6a6ff534c0
fixes import flash message [fixes SCI-2398]
2018-06-15 11:12:11 +02:00
okriuchykhin
801d0a4a22
Merge pull request #1212 from okriuchykhin/ok_SCI_2377
...
Add hooks to new report modal [SCI-2377]
2018-06-14 15:48:43 +02:00
Oleksii Kriuchykhin
13c374d9b3
Add hooks to new report modal [SCI-2377]
2018-06-14 15:26:06 +02:00
zmagod
3d7591100a
adds repository row assets to team import/export [fixes SCI-2165]
2018-06-14 15:20:57 +02:00
zmagod
4a82d1e7ac
fixes repository items import
2018-06-14 14:40:43 +02:00
zmagod
bb62fc3715
adds data-hook
2018-06-14 12:42:49 +02:00
Oleksii Kriuchykhin
e10ed86fa1
Remove result validation [SCI-2376]
2018-06-13 14:06:55 +02:00
zmagod
f2c0b3aa92
removes samples, adds list_items
2018-06-13 12:45:48 +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
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
d457a66996
Merge pull request #1205 from ZmagoD/zd_SCI_2427
...
enables tooltip on long column names [fixes SCI-2427]
2018-06-13 11:14:29 +02:00
Zmago Devetak
a8981d7039
Merge pull request #1201 from ZmagoD/zd_SCI_2421
...
fixes bug with tinymce/at.js [fixes SCI-2421]
2018-06-13 11:14:17 +02:00
Zmago Devetak
673410251d
Merge pull request #1197 from ZmagoD/zd_SCI_2384
...
fixes repository table on sidebar toggle [fixes SCI-2384]
2018-06-13 09:57:27 +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
Zmago Devetak
6cab1746cd
Merge pull request #1202 from ZmagoD/zd_SCI_2392
...
prevents asset preview modal to close on click [fixes SCI-2392]
2018-06-13 08:41:41 +02:00
Zmago Devetak
e06ab02f68
Merge pull request #1192 from ZmagoD/zd_SCI_2435
...
removes visibility toggle from Name column [fixes SCI-2435]
2018-06-13 08:41:25 +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
a66d65fb28
Fix the sign in halt layout
...
... so it's not dependant on common addon any more.
2018-06-12 14:47:15 +02:00
zmagod
1cff4a5060
make manage columns page more responsive [fixes SCI-2442]
2018-06-12 10:22:48 +02:00
zmagod
a8971b4e20
enables tooltip on long column names [fixes SCI-2427]
2018-06-11 15:22:56 +02:00
Zmago Devetak
a174e186bb
removes unneeded code
2018-06-11 15:00:13 +02:00
zmagod
256e502982
fixes bug with repository items dropdown [fixes SCI-2434]
2018-06-11 14:57:27 +02:00
mlorb
1e1330847f
remove unused code
2018-06-11 14:49:03 +02:00
mlorb
40f3365596
fix bug with truncating string
2018-06-11 14:47:25 +02:00
zmagod
32a09f9780
prevents asset preview modal to close on click [fixes SCI-2392]
2018-06-11 13:03:11 +02:00
zmagod
374a16abad
fixes bug with tinymce/at.js [fixes SCI-2421]
2018-06-11 10:18:35 +02:00
okriuchykhin
acd6efae57
Merge pull request #1200 from okriuchykhin/ok_SCI_2212
...
Add result content hook [SCI-2212]
2018-06-11 09:28:30 +02:00
Zmago Devetak
6ba5c587f7
Merge pull request #1189 from ZmagoD/zd_SCI_2211
...
add data-hook, refactor add user to project modal to support addons
2018-06-08 15:23:26 +02:00
Zmago Devetak
a7dc4f8933
Merge pull request #1194 from ZmagoD/add_data_hook
...
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
2018-06-08 14:49:48 +02:00
Zmago Devetak
0b5c1e3ecc
Merge pull request #1195 from ZmagoD/zd_SCI_2487
...
fixes assign items flash message [fixes SCI-2487]
2018-06-08 14:40:48 +02:00
Zmago Devetak
eff68aead8
Merge pull request #1193 from ZmagoD/zd_SCI_2481_
...
fixes project validation message [fixes SCI-2481]
2018-06-08 14:40:27 +02:00
Zmago Devetak
74ccaf06b9
Merge pull request #1184 from ZmagoD/zd_SCI_2417
...
adds asset_text_data to global search options
2018-06-08 14:30:52 +02:00
Oleksii Kriuchykhin
87925271e8
Add result content hook [SCI-2212]
2018-06-08 14:22:03 +02:00
Luka Murn
bfaedab4b4
Fix buttons style on tags modal
...
Closes SCI-2397.
2018-06-08 13:43:23 +02:00
zmagod
b7ecf09963
fixes repository table on sidebar toggle [fixes SCI-2384]
2018-06-08 10:58:28 +02:00
zmagod
f769215468
fixes assign items flash message [fixes SCI-2487]
2018-06-08 10:02:57 +02:00
zmagod
86c4093bf2
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
2018-06-08 09:41:04 +02:00
Luka Murn
eb29c50379
Fix asset link preview, fix inventory item modal window styling
2018-06-08 09:01:59 +02:00
Luka Murn
dbceac7aa4
Style inventories secondary navigation section
2018-06-08 08:31:22 +02:00
zmagod
11ebea573a
fixes project validation message [fixes SCI-2481]
2018-06-07 16:42:11 +02:00
Luka Murn
4cdfe67115
Fix protocol management filter display (css)
2018-06-07 15:57:59 +02:00
zmagod
51e024e3d7
adds data-hooks to reports and search results [fixes SCI-2374]
2018-06-07 14:29:40 +02:00
zmagod
c0b659a252
adds data-hook to repositories/show page
2018-06-07 10:50:48 +02:00
Luka Murn
b324a2dab3
Restyle activities page
2018-06-07 09:29:47 +02:00
Luka Murn
0417af716b
Remove new experiment button from canvas, change edit canvas btn
2018-06-06 17:41:07 +02:00
zmagod
43a60b632a
adds datahook to experiment card [fixes SCI-2373]
2018-06-06 17:28:04 +02:00
Luka Murn
c07fa5adc2
Update blank page for projects
2018-06-06 17:23:22 +02:00
Luka Murn
e0a3b5a941
Fix Save PDF to repository modal window
2018-06-06 16:29:07 +02:00
zmagod
a51ea399f4
removes unneeded empty lines
2018-06-05 16:39:22 +02:00
zmagod
66cac0b676
removes visibility toggle from Name column [fixes SCI-2435]
2018-06-05 16:36:36 +02:00
Luka Murn
3823eb8c74
Merge pull request #1191 from ZmagoD/zd_SCI_2486
...
fixes project duplication [fixes SCI-2486]
2018-06-05 09:49:34 +02:00
zmagod
2def874ffd
fixes project duplication [fixes SCI-2486]
2018-06-05 09:44:03 +02:00
Zmago Devetak
fad67d7730
Merge pull request #1185 from ZmagoD/zd_SCI_2468
...
Limits the max. amount of rows when importing into inventories [fixes…
2018-06-04 16:29:33 +02:00
zmagod
9b9143f145
add hook to tab pane
2018-06-01 16:46:27 +02:00
okriuchykhin
04accc8fc8
Merge pull request #1190 from okriuchykhin/ok_SCI_2478
...
Fix project_tree for non admin users [SCI-2478]
2018-06-01 16:40:05 +02:00
Oleksii Kriuchykhin
8de0e282e3
Fix project_tree for non admin users [SCI-2478]
2018-06-01 16:38:49 +02:00
zmagod
997748561b
adds missing js changes
2018-06-01 16:14:50 +02:00
zmagod
84170f6de0
add data-hook, refactor add user to project modal to support addons
2018-06-01 16:13:22 +02:00
okriuchykhin
5ba60d9f8f
Merge pull request #1188 from okriuchykhin/ok_SCI_2478
...
Improve sidebar rendering performance [SCI-2478]
2018-06-01 15:17:34 +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
Oleksii Kriuchykhin
58d8414f92
Code fixes for sidebar [SCI-2478]
2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin
2ddc0fb561
Improve sidebar rendering performance [SCI-2478]
2018-06-01 13:49:02 +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
zmagod
9abf50e7c5
Limits the max. amount of rows when importing into inventories [fixes SCI-2468]
2018-05-31 10:45:31 +02:00
zmagod
3da098cb60
fixes the issue with extraction of text from file [fixes SCI-2417]
2018-05-31 09:42:57 +02:00
Luka Murn
58e6701b0a
Merge pull request #1181 from Ducz0r/lm-sci-2471-fix
...
Fix inventory rows without files not being saved bug [SCI-2471]
2018-05-30 18:33:50 +02:00
Zmago Devetak
28abdf285e
Merge pull request #1183 from ZmagoD/zd_SCI_2451_v2
...
fixes sidebar [fixes SCI-2451]
2018-05-30 18:21:03 +02:00
mlorb
c17a947969
Merge pull request #1182 from mlorb/ml-sci-2459
...
Fix position of navigation bar is not saved [SCI-2459]
2018-05-30 18:10:01 +02:00
mlorb
35badd8bb8
move variable declaration
2018-05-30 17:58:18 +02:00
zmagod
e06ae9b543
fixes sidebar [fixes SCI-2451]
2018-05-30 16:53:08 +02:00
mlorb
100ddf127d
fix position of navigation bar is not saved
2018-05-30 16:46:27 +02:00
Luka Murn
68f5a6bebd
Fix inventory rows without files not being saved bug
...
Closes SCI-2471.
2018-05-30 14:41:20 +02:00
mlorb
858b95d851
fix align bullet with a file name
2018-05-30 13:58:16 +02:00
okriuchykhin
3253cac86f
Merge pull request #1178 from okriuchykhin/ok_SCI_2462
...
Add user id tracking when discarding repository [SCI-2462]
2018-05-30 10:23:17 +02:00
Zmago Devetak
332ddd9c10
Merge pull request #1177 from ZmagoD/zd_SCI_2420
...
fixes bug with empty submit of repository row [fixes SCI-2420]
2018-05-29 15:38:45 +02:00
Oleksii Kriuchykhin
6cf9149baa
Add user id tracking when discarding repository [SCI-2462]
2018-05-29 15:33:02 +02:00
zmagod
b74598a748
fixes bug with empty submit of repository row [fixes SCI-2420]
2018-05-29 14:47:40 +02:00
zmagod
89046e9787
fixes items assign flash message [fixes SCI-2395]
2018-05-29 12:54:41 +02:00
okriuchykhin
6deaa7235b
Merge pull request #1136 from okriuchykhin/ok_SCI_2396
...
Handle situation with smart annotations and zero inventories [SCI-2396]
2018-05-28 17:23:29 +02:00
Zmago Devetak
147e74b4a5
Merge pull request #1164 from ZmagoD/zd_SCI_2448
...
adds discard gem, move deletion of repositories in a rake task to run…
2018-05-28 15:04:54 +02:00
Zmago Devetak
ad5114090f
Merge pull request #1165 from ZmagoD/zd_SCI_2433
...
fixes tast description/due-date modal [fixes SCI-2433]
2018-05-28 13:10:15 +02:00
okriuchykhin
0e6c89c3de
Merge pull request #1166 from okriuchykhin/ok_SCI_2342
...
Fix WOPI controller to support repositories [SCI-2342]
2018-05-28 13:07:17 +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
80323eaf67
Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle
...
Conflicts:
app/assets/javascripts/sidebar_toggle.js.erb
2018-05-28 12:39:24 +02:00
Luka Murn
e611e76fae
Fix Hound errors
2018-05-28 11:53:49 +02:00
mlorb
2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405
2018-05-28 11:43:14 +02:00
mlorb
f791234ec7
changes on Zmago's request
2018-05-28 11:36:37 +02:00
Zmago Devetak
9513efa3f3
Merge pull request #1173 from ZmagoD/zd_SCI_2451
...
fixes sidebar animation [fixes SCI-2451]
2018-05-28 11:18:07 +02:00
Oleksii Kriuchykhin
f0362a0c02
Fix left menu word breaking [SCI-2458]
2018-05-28 10:42:07 +02:00
Zmago Devetak
792b134737
Merge pull request #1170 from ZmagoD/zd_SCI_2437
...
adds flash_message div in manage repository column page
2018-05-28 10:32:06 +02:00
zmagod
485993f2f6
fixes sidebar animation [fixes SCI-2451]
2018-05-28 10:28:35 +02:00
mlorb
099cc29abb
fix tests
2018-05-28 09:29:46 +02:00
Luka Murn
b3ae1d8fa6
Remove some dead code, make sidebar toggle animated
2018-05-27 16:24:47 +02:00
Luka Murn
b86edf20a5
Remove auto-toggling of navigation sidebar depending on width
2018-05-27 15:44:15 +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
6e6b6803e6
Remove session-stored toggle state of navigation bar
2018-05-27 15:24:11 +02:00
Luka Murn
ce4883522a
Merge pull request #1171 from biosistemika/lm-change-login-btn-to-primary
...
Change login button color to green
2018-05-25 17:15:57 +02:00
Luka Murn
0fc278a74c
Merge pull request #1169 from biosistemika/lm-remove-report-sidebar-file
...
Delete _report_sidebar.html.erb
2018-05-25 17:15:27 +02:00
mlorb
f02363dfce
fix error if user is not assigned to any teams
2018-05-25 17:14:22 +02:00
Luka Murn
23d8dc0b31
Change login button color to green
...
What it says, change it to `btn-primary`.
2018-05-25 17:05:00 +02:00
zmagod
6512970b9c
adds flash_message div in manage repository column page
2018-05-25 14:36:15 +02:00
zmagod
c683cfdbd7
triggers the delayed job in the controller action, fixes smart annotations
2018-05-25 11:41:43 +02:00
Luka Murn
c76b926387
Delete _report_sidebar.html.erb
...
This file is no longer needed from my research.
2018-05-25 11:04:05 +02:00
Luka Murn
fe3ddb7c65
Update code so it works
2018-05-25 08:50:27 +02:00
Oleksii Kriuchykhin
46d6accf78
Fix search in repositories [SCI-2428]
2018-05-24 17:14:40 +02:00