scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5235 commits 70 branches 179 tags 165 MiB
Commit graph

1453 commits

Author SHA1 Message Date
Urban Rotnik b50320a4bc Add margin for system notification modal 2019-02-21 15:15:33 +01:00
Oleksii Kriuchykhin db18f88807 Update templates to final version [SCI-3053] 2019-02-21 15:06:34 +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
Alex Kriuchykhin 0a54eb8ebe
Merge pull request #1503 from biosistemika/features/templates 
Merge features/templates to master
 2019-02-19 15:07:42 +01:00
Urban Rotnik 7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
Mojca Lorber ebfacdd62c change experiments title color 2019-02-19 14:24:23 +01:00
aignatov-bio fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-19 13:51:18 +01:00
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
mlorb 71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +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
Mojca Lorber d8cc482cbf remove electronic signatures from templates 2019-02-11 17:51:48 +01:00
Mojca Lorber 78a29c4141 add templates after protocol_keyword_team rake task was run 2019-02-11 16:15:56 +01:00
Mojca Lorber 087832c29d add templates 2019-02-11 14:02:49 +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 227aeb284c change mydemo projects data 2019-02-05 11:15:16 +01:00
Oleksii Kriuchykhin a033e9b207 Fix Lato font loading [SCI-2969] 2019-02-04 15:36:17 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +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
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +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
Alex Kriuchykhin be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931 
Fix image URLs in export all document [SCI-2931]
 2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin 132f46b136 Improve error handling in task inventories dropdown [SCI-2776] 2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +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 5ebcd1dfe1
Merge pull request #1423 from mlorb/ml-sci-2911 
Fix export projects getting fired multiple times [SCI-2911]
 2018-12-17 11:26:40 +01:00
Oleksii Kriuchykhin 97bde075b2 Change color of the selected element in the side navigation [SCI-2909] 2018-12-13 16:50:22 +01:00
mlorb 55cab34eb4 fix export projects getting fired miltiple times 2018-12-13 16:46:08 +01:00
Luka Murn 022d0d9512
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix 
Change export all to use HTML instead of PDF [SCI-2902]
 2018-12-13 15:19:37 +01:00
mlorb cfd5156c09
Merge pull request #1416 from mlorb/ml-sci-2871 
Fix behavior when user has no teams [SCI-2871]
 2018-12-12 11:27:28 +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
Luka Murn 65adc7a556 Fix 2 minor visual bugs in reports 2018-12-12 11:15:32 +01:00
mlorb 4040b31143 Fix behavior when user has no teams 2018-12-10 15:42:05 +01:00
Alex Kriuchykhin 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 7c3bad1e86
Merge pull request #1410 from mlorb/ml-sci-2789 
Fix missing protocols link tooltip [SCI-2789]
 2018-12-10 09:15:31 +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 3031fb7a4b
Merge pull request #1398 from mlorb/ml-sci-2786 
Fix projects table css [SCI-2786]
 2018-12-06 09:15:51 +01:00
mlorb c7f5c17e7e change css again 2018-12-04 11:21:54 +01:00
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
Luka Murn 8b1449b5a2 Add bottom margin to OAuth authorize page, for better mobile xp 2018-11-28 21:46:33 +01:00
mlorb 15ddd0ab91 fix projects table css 2018-11-27 12:37:10 +01:00
Oleksii Kriuchykhin 79544e789d Fix support menu for Safari [SCI-2885] 2018-11-26 18:47:21 +01:00
Oleksii Kriuchykhin 2e00f1546a Fix handsontable initialization [SCI-2882] 2018-11-26 14:11:46 +01:00
Alex Kriuchykhin 95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859 
Refactor & restyle the API authorization screen [SCI-2859]
 2018-11-22 13:06:13 +01:00
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
Alex Kriuchykhin afe5db5cf3
Merge pull request #1382 from okriuchykhin/ok_SCI_2872 
Change text color on project cards tabs [SCI-2872]
 2018-11-21 10:59:03 +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
Oleksii Kriuchykhin 59fb971394 Change text color on project cards tabs [SCI-2872] 2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin d98f11abdc Refactor & restyle the API authorization screen [SCI-2859] 2018-11-20 17:02:45 +01:00
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
Luka Murn 42793d25b7 Add bottom padding to sign in/up/forgot password pages 
Closes SCI-2764.
 2018-10-24 13:57:58 +02:00
Matej Zrimšek 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