Alex Kriuchykhin
|
a6bc02a2cb
|
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
Refactor result and step comments [SCI-2830]
|
2018-11-20 00:13:15 +01:00 |
|
mlorb
|
3b96a60938
|
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
|
2018-11-19 11:36:08 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +01:00 |
|
Alex Kriuchykhin
|
324069c071
|
Merge pull request #1370 from okriuchykhin/ok_SCI_2853
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
|
2018-11-14 13:51:43 +01:00 |
|
Oleksii Kriuchykhin
|
3fd687161f
|
Remove unused variables from activities controller [SCI-2778]
|
2018-11-14 13:17:38 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Oleksii Kriuchykhin
|
c44109958a
|
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
|
2018-11-14 12:56:04 +01:00 |
|
Oleksii Kriuchykhin
|
380a96dcce
|
Add caching for step and result fragments [SCI-2830]
|
2018-11-14 11:57:53 +01:00 |
|
Luka Murn
|
98a39ecd72
|
Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
|
2018-11-14 11:33:27 +01:00 |
|
Oleksii Kriuchykhin
|
fb309a12b9
|
Refactor result and step comments initialization [SCI-2830]
|
2018-11-13 16:57:42 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
Oleksii Kriuchykhin
|
98d1ea8542
|
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 15:51:03 +01:00 |
|
Oleksii Kriuchykhin
|
e89d60785f
|
Fix dates on activities and experiments [SCI-2778]
|
2018-11-12 10:26:48 +01:00 |
|
Matej Zrimšek
|
57dbd63aa3
|
Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817]
|
2018-11-12 01:34:00 +01:00 |
|
Oleksii Kriuchykhin
|
8d0dbc7076
|
Add time format selection to settings [SCI-2778]
|
2018-11-09 16:19:40 +01:00 |
|
mlorb
|
4d156080ac
|
fix empty projects page bug and projects tree bug
|
2018-11-07 13:45:46 +01:00 |
|
mlorb
|
63e039e235
|
fix bug with new project button not working
|
2018-11-06 11:38:31 +01:00 |
|
Alex Kriuchykhin
|
c1d853f7bd
|
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-29 10:56:02 +01:00 |
|
Oleksii Kriuchykhin
|
641d74829a
|
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-24 17:52:40 +02: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 |
|
Luka Murn
|
95340bcf36
|
Update team name placeholder & sublabel on sign up pages
|
2018-10-24 13:43:56 +02:00 |
|
Matej Zrimšek
|
c89488e105
|
Fix displaying projects when all are archived [SCI-2787]
|
2018-10-24 03:34:13 +02:00 |
|
Matej Zrimšek
|
43fdab561f
|
Fix project archiving and restoring edge case [SCI-2787]
|
2018-10-24 01:37:57 +02:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Jure Grabnar
|
ed16e8d479
|
Fix reviewers errors
|
2018-10-16 11:00:38 +02:00 |
|
Jure Grabnar
|
26df1e5a98
|
Add export project modal
Closes [SCI-2645]
|
2018-10-16 11:00:38 +02:00 |
|
Matej Zrimšek
|
48a6a64502
|
Move PDF generation and export logic of export all PDF to the model
|
2018-10-14 22:52:54 +02:00 |
|
Matej Zrimšek
|
69f3a919db
|
Some specification and syntax fixes [SCI-2641]
|
2018-10-12 07:42:17 +02:00 |
|
Matej Zrimšek
|
d970576d60
|
Switch between generating report PDF and export all PDF [SCI-2641]
|
2018-10-12 07:40:21 +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
|
7152d2f0f1
|
Fix/update file naming convection for exported files [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
6f77c4772c
|
Minor fix for assets & tables naming in export all PDF
|
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 |
|
Zanz2
|
4dc1320988
|
Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760
Disabled turbolinks in left navigation bar protocols button [SCI-2760]
|
2018-10-10 17:14:15 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
Alex Kriuchykhin
|
16b29b50a5
|
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
Add Projects view - list/table view [SCI-2731]
|
2018-10-08 17:53:35 +02:00 |
|
Oleksii Kriuchykhin
|
7a591273a3
|
Remove unused variables [SCI-2731]
|
2018-10-08 13:45:26 +02:00 |
|
Zanz2
|
cfe5801856
|
Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue
|
2018-10-06 12:56:13 +02:00 |
|
Jure Grabnar
|
d7c875135e
|
Merge pull request #1304 from jbargu/jg_zipfile_structure
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
|
2018-10-05 15:36:56 +02:00 |
|
Oleksii Kriuchykhin
|
ba58eec2e2
|
Merge latest features/export-all [SCI-2731]
|
2018-10-03 11:04:44 +02:00 |
|
Luka Murn
|
21a24dc98b
|
Fix invite users modal to display tooltips in all variants
Closes SCI-2759.
|
2018-10-02 17:55:39 +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 |
|
Luka Murn
|
c079f16d58
|
Fix the tooltips positioning on canvas
|
2018-10-02 13:50:26 +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 |
|
Oleksii Kriuchykhin
|
2508394924
|
Refactor Projects view - cards view [SCI-2730]
|
2018-09-27 10:43:44 +02:00 |
|
Oleksii Kriuchykhin
|
f8388d4bcd
|
Merge branch 'ok_SCI_2729' into ok_SCI_2730
|
2018-09-25 10:26:46 +02:00 |
|
Oleksii Kriuchykhin
|
80e73bfb97
|
Implement Projects view - navigation bar (tabs) [SCI-2729]
|
2018-09-24 16:25:04 +02:00 |
|
Luka Murn
|
63b4f7d909
|
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
|
2018-09-24 16:23:53 +02:00 |
|
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 |
|
Jure Grabnar
|
7877d559a3
|
Update email/notification, type: deliver
Closes [SCI-2643], [SCI-2644].
|
2018-09-23 18:45:13 +02:00 |
|
Oleksii Kriuchykhin
|
84428b37c2
|
Add project view JSON endpoints [SCI-2728]
|
2018-09-21 10:39:20 +02:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Oleksii Kriuchykhin
|
49e788a9ad
|
Mergre latest core-api [SCI-2515]
|
2018-09-14 10:24:05 +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 |
|
Luka Murn
|
586a442abc
|
Refactor the settings page, rename setting to tooltips_enabled
|
2018-09-05 16:36:32 +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
|
15c124f3fd
|
replaced image icon with paperclip, to represent files, removed all image icons
|
2018-08-27 13:07:18 +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
|
75a48291e1
|
Merge pull request #1272 from okriuchykhin/ok_SCI_2654
Fix report elements sorting [SCI-2654]
|
2018-08-22 14:20:54 +02:00 |
|
Zanz2
|
0ed62b7375
|
refactored according to PR review
|
2018-08-21 11:35:22 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
mlorb
|
a6dd577b4e
|
fix time zone selector
|
2018-08-08 11:43:18 +02:00 |
|
Oleksii Kriuchykhin
|
38c36ab798
|
Fix modals handling with Turbolinks [SCI-2253]
|
2018-08-02 11:25:14 +02:00 |
|
Oleksii Kriuchykhin
|
5c999300b5
|
Fix avatar upload validators [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 |
|
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 |
|
Oleksii Kriuchykhin
|
3aceb12f03
|
Fix delete button in inventories [SCI-2594]
|
2018-07-08 21:59:02 +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
|
eb75f6c03d
|
fixes bug with checkAvailableColumns function [fixes SCI-2578]
|
2018-06-29 10:28:46 +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
|
db1944cc90
|
move maximum file size limit to an ENV variable [fixes SCI-2415]
|
2018-06-19 14:15:14 +02:00 |
|