Jure Grabnar
|
b4199b28e4
|
Remove turbolinks:load from the project show page
Also rename Demo project experiment back to PCR.
Closes SCI-3081.
|
2019-02-22 19:46:42 +01:00 |
|
Anton Ignatov
|
6971d1a55d
|
Adding new Select2 library with customization
|
2019-02-22 16:40:33 +01:00 |
|
Miha Mencin
|
bcd0b433b6
|
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-21 16:38:58 +01:00 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
aignatov-bio
|
5fdba554d2
|
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-20 17:22:57 +01:00 |
|
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 |
|
Jure Grabnar
|
27ed8e781e
|
Merge pull request #1501 from jbargu/jg_sci_2985_recaptcha_invite_not_working
Recaptcha input field now addressed with jQuery
|
2019-02-20 08:44: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 |
|
Jure Grabnar
|
ebdf9adab0
|
Recaptcha input field now addressed with jQuery
Fix SCI-2985
|
2019-02-19 13:05:33 +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
|
c598541e09
|
System notification modal window [SCI-2957 and SCI-2958] (#1484)
* Added new system notification modal
* Adding loading system notification on sign in
|
2019-02-15 13:07:29 +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 |
|
Mojca Lorber
|
3b4a894124
|
fix hound
|
2019-02-12 11:24:44 +01:00 |
|
aignatov-bio
|
de75ec4600
|
Merge pull request #1485 from biosistemika/ai-sci-3006-inventory-order-bug
[SCI-3006] After changing order of inventory columns item can not be edited, deleted, copied
|
2019-02-11 13:50:13 +01:00 |
|
Oleksii Kriuchykhin
|
2ff5199be0
|
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-07 16:58:38 +01:00 |
|
Anton Ignatov
|
4145b2565c
|
Fixed bug with order in inventories SCI-3006
|
2019-02-07 11:34:04 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
Miha Mencin
|
b67cee2e65
|
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug
SCI-2928 moving team modal js file to application.js.erb in order to …
|
2019-01-25 11:54:14 +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 |
|
Miha Mencin
|
126a031498
|
SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded
|
2019-01-23 15:30:23 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +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 |
|
Miha Mencin
|
0766ee96a7
|
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-16 12:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
3a4b992f4e
|
Code style fixies []SCI-2875]
|
2019-01-14 16:31:23 +01:00 |
|
Oleksii Kriuchykhin
|
89240659a7
|
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-11 17:20:39 +01:00 |
|
Alex Kriuchykhin
|
b530cea771
|
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-11 16:27:22 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Alex Kriuchykhin
|
8ea37c541b
|
Merge pull request #1436 from okriuchykhin/ok_SCI_2904
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2019-01-10 11:04:26 +01:00 |
|
mlorb
|
06b1e5cf20
|
Allow org. administrators to invite them onto all projects
|
2019-01-08 16:30:52 +01:00 |
|
Jure Grabnar
|
fe46f9c9fe
|
Reinit tooltips after cancel/save step
Closes SCI-2891.
|
2019-01-08 15:36:44 +01:00 |
|
Matej Zrimšek
|
8070b7f8b5
|
Fix Date and Time display formats on JS side
|
2019-01-08 08:07:24 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Oleksii Kriuchykhin
|
3610960ee3
|
Fix ajax calls duplication [SCI-2916]
|
2018-12-17 20:59:22 +01:00 |
|
mlorb
|
55cab34eb4
|
fix export projects getting fired miltiple times
|
2018-12-13 16:46:08 +01:00 |
|
mlorb
|
8170e1b367
|
Merge pull request #1414 from mlorb/ml-sci-2899
Fix invited member is added multiple times to team [SCI-2899]
|
2018-12-12 11:26:41 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +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
|
2246166107
|
fix protocol link tooltip again
|
2018-12-07 12:00:42 +01:00 |
|
mlorb
|
d37f3a3c09
|
fix invited member is added multiple times to team
|
2018-12-07 11:36:26 +01:00 |
|
mlorb
|
7d1817350a
|
fix missing protocols link tooltip
|
2018-12-04 10:45:16 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
Oleksii Kriuchykhin
|
2e00f1546a
|
Fix handsontable initialization [SCI-2882]
|
2018-11-26 14:11:46 +01:00 |
|
mlorb
|
de803e70a8
|
Merge pull request #1385 from mlorb/ml-sci-2866
Fix in app help window does not close in some cases [SCI-2866]
|
2018-11-22 10:48:52 +01:00 |
|
Alex Kriuchykhin
|
f811afc7e2
|
Merge pull request #1387 from okriuchykhin/ok_SCI_2877
Fix comments form for new results [SCI-2877]
|
2018-11-22 10:28:09 +01:00 |
|
Oleksii Kriuchykhin
|
6cd033767c
|
Fix comments form for new results [SCI-2877]
|
2018-11-21 23:48:43 +01:00 |
|
Oleksii Kriuchykhin
|
df938a8ba5
|
Fix task tags modal [SCI-2875]
|
2018-11-21 22:24:12 +01:00 |
|
mlorb
|
39b01bc8ed
|
fix in app help window does not close in some cases
|
2018-11-21 10:19:41 +01:00 |
|
mz3944
|
a9eb2fc249
|
Merge pull request #1377 from mz3944/mz-SCI-2863
Fix DataTable display for protocol modal [SCI-2863]
|
2018-11-20 21:21:29 +01:00 |
|
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 |
|
Oleksii Kriuchykhin
|
b7ccfccfe0
|
Imrove tags update behaviour on canvas [SCI-2830]
|
2018-11-19 11:48:53 +01:00 |
|
Matej Zrimšek
|
716e74ceb4
|
Fix DataTable display for protocol modal [SCI-2863]
|
2018-11-19 07:21:29 +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 |
|
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 |
|
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 |
|
mz3944
|
d733f4e357
|
Merge pull request #1346 from mz3944/mz-SCI-2787
In project list table table is not updated when archiving/restoring project [SCI-2787]
|
2018-10-28 14:36:17 +01:00 |
|
Oleksii Kriuchykhin
|
6e6bb73d2f
|
Remove double initialization of comments on steps [SCI-2756]
|
2018-10-26 09:29:42 +02:00 |
|
Matej Zrimšek
|
6447750ff7
|
Fix showing projects in table view when all are archived [SCI-2787]
|
2018-10-25 22:31:00 +02:00 |
|
Matej Zrimšek
|
c89488e105
|
Fix displaying projects when all are archived [SCI-2787]
|
2018-10-24 03:34:13 +02:00 |
|
mlorb
|
e5fca1b1cd
|
change the rich text max limit on frontend to 50000
|
2018-10-18 14:22:15 +02:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Jure Grabnar
|
447cad083d
|
Fix formatting according to HoundBot
|
2018-10-16 11:01:58 +02:00 |
|
Jure Grabnar
|
d50f56e319
|
Disable/enable export proejct button
Fix filesystem saving
|
2018-10-16 11:01:58 +02:00 |
|
Jure Grabnar
|
6b47165ac1
|
Fix formatting according to Houndbot
|
2018-10-16 11:00:38 +02:00 |
|
Jure Grabnar
|
2558b7a313
|
Fix formatting according to HoundBot
|
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 |
|
Oleksii Kriuchykhin
|
f221d71bbc
|
Fix datatables state restore [SCI-2733]
|
2018-10-12 15:15:43 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
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 |
|
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 |
|
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
|
5b955da74c
|
makes tooltip behaviour more reliable and less erratic
|
2018-09-16 21:34:36 +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 |
|
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 |
|
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 |
|
Luka Murn
|
99c156de94
|
Fix (hopefully) the TinyMCE files from being cached
Closes SCI-2717.
|
2018-09-12 15:28:21 +02:00 |
|
Zanz2
|
a0c6a0c407
|
changed name of data attribute
|
2018-09-07 15:33:38 +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
|
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 |
|