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
5062 commits 70 branches 179 tags 165 MiB
Commit graph

1518 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 0930277c4e Add views and helpers for global activities individual cards [SCI-2994][SCI-3024] 2019-02-27 16:02:53 +01:00
Miha Mencin 76c3db0b11 added layout, added css, added select2 lib, WIP 2019-02-25 16:50:38 +01:00
aignatov-bio aa8a2b040a
Merge pull request #1518 from biosistemika/features/system-notifications 
Notification changes on settings page [SCI 3084] (#1517)
 2019-02-22 14:01:38 +01:00
aignatov-bio 606708987f
Notification changes on settings page [SCI 3084] (#1517) 
* Fix css and update text settings
 2019-02-22 13:20:51 +01:00
Jure Grabnar fb533eb9d3
Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed 
Add action_name to sidebar cache as dependency [SCI-2930]
 2019-02-22 10:04:57 +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
Jure Grabnar 0fa06ea9fc
Merge pull request #1505 from jbargu/jg_sci_2928_few_turbolinks_bugs 
Check for recaptcha enabled boolean value
 2019-02-20 18:29:40 +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
Jure Grabnar 61f9df0656 Add action_name to sidebar cache as dependency 
Closes SCI-2930.
 2019-02-20 14:13:51 +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 e392f9e61f Check for recaptcha enabled boolean value 
Closes SCI-2928.
 2019-02-20 10:14:37 +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
Urban Rotnik 29d77ca81d Add system_notification sending email feature 2019-02-19 11:20:25 +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
Anton Ignatov c6ab6da381 Fixed counter bug SCI-3005 2019-02-07 14:23:37 +01:00
Matej Zrimšek ac78c7d21b Process Handsontable formulas in project HTML files in team export [SCI-2918] 2019-01-31 07:39:17 +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
mz3944 79d35de794
Merge pull request #1435 from mz3944/mz-SCI-2912 
An error at archiving experiment with locked task [SCI-2912]
 2019-01-24 05:27:58 +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
Urban Rotnik 686f10cbd0 Refactor instance method 'ordered_modules' to scope 2019-01-18 16:56:33 +01:00
Urban Rotnik 1b70f42817 Refactor 'Experiment.modules_without_group' to Module's scope 2019-01-18 16:54:00 +01:00
mlorb 7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin 1861f86b2c Improve export all modal messages in case of unlimited exports [SCI-2965] 2019-01-17 17:27:32 +01:00
Oleksii Kriuchykhin e62e1873b0 Fix issue with caching in inventories dropdown [SCI-2776] 2019-01-17 15:04:20 +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
Matej Zrimšek 838455af0d Fix protocols.io Date handling at import 2019-01-12 19:28:45 +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
Matej Zrimšek b64df7d8cc Fix additional Date and Time display formats 2019-01-08 06:29:37 +01:00
Alex Kriuchykhin 8ffe5dafee
Merge pull request #1437 from okriuchykhin/ok_SCI_2907 
Change sample date in date format settings [SCI-2907]
 2019-01-03 16:10:19 +01:00
Oleksii Kriuchykhin 5ea5b76d39 Change sample date in date format settings [SCI-2907] 2019-01-03 14:15:41 +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
Matej Zrimšek c84457e1ed Prevent archiving of experiments with at least one locked task 2018-12-23 21:17:51 +01:00
Luka Murn ac5c809d20 Add force_encoding to export all report view template 2018-12-18 21:03:10 +01:00
Luka Murn 097e871228 Fix assets include in export all report to work on production env 
Closes SCI-2902.
 2018-12-18 09:10:55 +01:00