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

4941 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Urban Rotnik 147b7039a3
Merge pull request #1512 from urbanrotnik/ur-SCI-3054-whats-new-notification-modal-content 
Add margin  for system notification modal [SCI-3054]
 2019-02-21 15:56:17 +01:00
Urban Rotnik b50320a4bc Add margin for system notification modal 2019-02-21 15:15:33 +01:00
Urban Rotnik f0933f4a89
Merge pull request #1509 from urbanrotnik/ur-SCI-3060-SN-limits-for-fields 
Add validation limits for system notification fields [SCI-3060]
 2019-02-20 16:41:39 +01:00
Urban Rotnik 22dd1f8f1c
Merge pull request #1508 from urbanrotnik/ur-SCI-3050-polsih-SN-email 
System Notification polish🇵🇱 Email [SCI-3050]
 2019-02-20 16:36:10 +01:00
Urban Rotnik 82ea31e275 Add validation limits for system notification fields 2019-02-20 16:05:15 +01:00
Urban Rotnik 8768fcac6c Copy change 2019-02-20 14:19:59 +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
Anton Ignatov ec18280af4 remove yarn.lock 2019-02-19 13:17:05 +01:00
Urban Rotnik a31181e3d3 Merge branch 'ur-SCI-2961-SN-emails' into features/system-notifications 2019-02-19 12:52:00 +01:00
Urban Rotnik f7c7335bf0 Change test to pass on Travis 2019-02-19 11:23:01 +01:00
Urban Rotnik d3d9868ba4 Set version for HTTParty dependency, add opts in mailer 2019-02-19 11:23:01 +01:00
Urban Rotnik f63eaaefe7 Add user_system_notification records when syncing notifications, update email sending 2019-02-19 11:22:58 +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
Urban Rotnik ada0846f38 Merge branch 'ur-SCI-2954-client-synchronization-service' into features/system-notifications 2019-02-13 15:49:55 +01:00
Urban Rotnik 5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik 9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +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
Miha Mencin 3538e74b03
Merge pull request #1472 from biosistemika/mm-sci-2953-system-notifications-data-migration 
System Notifications - Migration of existing data
 2019-02-01 14:02:00 +01:00
Miha Mencin e2b94fa8a7 added last changed at to system notification 2019-02-01 12:44:45 +01:00
Miha Mencin 1ca225bc5d added copy and delete tasks, remove obsolete new_system task 2019-02-01 10:02:47 +01:00
Urban Rotnik 3e4cf7ae3c Merge branch 'ur-SCI-2952-SN-data-model-changes' into features/system-notifications 2019-02-01 09:55:12 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Urban Rotnik 863e3873c2 Comment for depricated NotificationType 2019-01-29 11:40:26 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Luka Murn 4efb51c17f
Merge pull request #1470 from biosistemika/master 
Merge master into features/system-notifications
 2019-01-29 08:58:54 +01:00
Urban Rotnik ed388db723 Merge branch 'ur-SCI-2926' 2019-01-28 11:58:35 +01:00
Urban Rotnik 4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Miha Mencin 846fd1fb30
Merge pull request #1468 from biosistemika/SCI-2936-change-indexes-to-bigint 
Write a DB migration to convert index columns to bigint
 2019-01-28 11:44:46 +01:00
Miha Mencin 4acd2a592d Adding previously forgotten schema file 2019-01-28 11:25:35 +01:00
Alex Kriuchykhin 52dec610b1
Merge pull request #1466 from biosistemika/release_1_15_3 
Add libssl-1.0 to docker images [SCI-2970]
 2019-01-25 17:00:03 +01:00
Alex Kriuchykhin bbfae1dfac
Merge pull request #1465 from okriuchykhin/ok_SCI_2970 
Add libssl-1.0 to docker images [SCI-2970]
 2019-01-25 16:19:49 +01:00
Oleksii Kriuchykhin c521e537c3 Add comments to docker files [SCI-2970] 2019-01-25 14:31:32 +01:00
Miha Mencin 344cb55a68
Merge pull request #1455 from biosistemika/SCI-2936-change-indexes-to-bigint 
SCI-2936 Write a DB migration to convert index columns to bigint
 2019-01-25 14:28:24 +01:00
Miha Mencin 713ece6ba6 Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-2936-change-indexes-to-bigint 2019-01-25 14:08:01 +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 b85386802c Merge branch 'ur-SCI-2935-add-recaptcha-to-invite-users-modal' 2019-01-25 11:30:50 +01:00
Urban Rotnik 16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
Urban Rotnik 99568612b1 Merge branch 'ur-SCI-2968-refactor-export-all-counter-reset-logic' 
SCI-2968
 2019-01-25 11:24:51 +01:00
Urban Rotnik 247bae8a9f Refactor export_all_counter increasing/reseting logic 
- Remove daily task
- Add method to user Model
 2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin 173c4fc701 Add libssl-1.0 to docker images [SCI-2970] 2019-01-25 11:05: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
Miha Mencin 58f06ac570
Merge pull request #1459 from Ducz0r/lm-fix-cucumber-tests 
Fix the Cucumber tests so they pass
 2019-01-21 17:20:42 +01:00
Luka Murn 208ef0bfe1 Fix the Cucumber tests so they pass 
With the change of factories, single Cucumber test stopped
working due to text in the test being dependant on a now randomly
(Faker) defined value.
 2019-01-21 15:06:39 +01:00
Luka Murn 38d303b658
Merge pull request #1446 from Ducz0r/lm-remove-test-folder 
Remove test folder
 2019-01-21 14:07:22 +01:00
Miha Mencin 6e16a63dcd implementing suggestion from alex, now table and indices names are hardoced 2019-01-21 11:02:33 +00:00