aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +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 |
|
mlorb
|
86c325c9e6
|
Merge pull request #1480 from mlorb/ml-sci-2940
Update the Demo Project generation [SCI-2940]
|
2019-02-14 08:14: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 |
|
mlorb
|
71e4cc4dbd
|
Merge branch 'master' into ml-sci-2940
|
2019-02-13 14:35:03 +01:00 |
|
Mojca Lorber
|
0adb8b2b61
|
Fix failing tests
|
2019-02-13 14:31:26 +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 |
|
Mojca Lorber
|
16f99afbc0
|
Minor fixes
|
2019-02-13 12:20: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 |
|
aignatov-bio
|
16164477ac
|
Merge pull request #1487 from biosistemika/ai-sci-3005-user-counter-card-not-updated
User counter on task card is not updated [SCI-3005]
|
2019-02-11 13:49:49 +01:00 |
|
Alex Kriuchykhin
|
b7d7e4bf10
|
Merge pull request #1488 from okriuchykhin/ok_SCI_3030
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-11 13:41:01 +01:00 |
|
Alex Kriuchykhin
|
11e0ccc24a
|
Merge pull request #1479 from okriuchykhin/ok_SCI_2967
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-11 12:56:31 +01:00 |
|
Oleksii Kriuchykhin
|
2ff5199be0
|
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-07 16:58:38 +01:00 |
|
Alex Kriuchykhin
|
dc7fdaa191
|
Merge pull request #1486 from okriuchykhin/ok_SCI_3023
Improve error logging in protocol import [SCI-3023]
|
2019-02-07 15:58:07 +01:00 |
|
Anton Ignatov
|
c389b7ab06
|
remove console.log from js
|
2019-02-07 14:26:15 +01:00 |
|
Anton Ignatov
|
c6ab6da381
|
Fixed counter bug SCI-3005
|
2019-02-07 14:23:37 +01:00 |
|
Oleksii Kriuchykhin
|
3376fd012c
|
Improve error loggin in protocol import [SCI-3023]
|
2019-02-07 14:00:24 +01:00 |
|
Anton Ignatov
|
4145b2565c
|
Fixed bug with order in inventories SCI-3006
|
2019-02-07 11:34:04 +01:00 |
|
Oleksii Kriuchykhin
|
fdff69f22e
|
Add comment for Tika start up code [SCI-2967]
|
2019-02-07 11:06:25 +01:00 |
|
mz3944
|
108d8474f1
|
Merge pull request #1481 from mz3944/mz-SCI-3003
Experiment image is not updated after move of an experiment to another project [SCI-3003]
|
2019-02-07 04:42:36 +01:00 |
|
Matej Zrimšek
|
f68adf1e5e
|
Fix workflow image loading for moved experiments [SCI-3003]
|
2019-02-06 07:51:43 +01:00 |
|
Mojca Lorber
|
227aeb284c
|
change mydemo projects data
|
2019-02-05 11:15:16 +01:00 |
|
Alex Kriuchykhin
|
7eb53d6408
|
Merge pull request #1478 from okriuchykhin/ok_SCI_2969
Fix Lato font loading [SCI-2969]
|
2019-02-04 17:21:49 +01:00 |
|
Oleksii Kriuchykhin
|
13c4bd25af
|
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-04 16:47:29 +01:00 |
|
Oleksii Kriuchykhin
|
a033e9b207
|
Fix Lato font loading [SCI-2969]
|
2019-02-04 15:36:17 +01:00 |
|
Miha Mencin
|
688406cb2f
|
correct headings
|
2019-02-04 15:07:40 +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 |
|
Miha Mencin
|
e84ab5b550
|
Merge pull request #1475 from biosistemika/mm-sci-2982-user-variables-bug
SciNoteSCI-2982 Investigate (plus, fix) the User.variables on my.scinote.net
|
2019-02-01 09:46:19 +01:00 |
|
mz3944
|
a315808d58
|
Merge pull request #1473 from mz3944/mz-SCI-2918
In html project export there is formula instead of result in table [SCI-2918]
|
2019-02-01 04:49:14 +01:00 |
|
Urban Rotnik
|
8ebb7561d9
|
Add last_time_changed_at columnd to SystemNotifications
|
2019-01-31 16:44:20 +01:00 |
|
Miha Mencin
|
d2dfe68e46
|
Changing double quotes to single quotes
|
2019-01-31 10:31:03 +01:00 |
|
Miha Mencin
|
3ec62758fe
|
SCI-2982, handle the empty json condition
|
2019-01-31 09:43:41 +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 |
|
Urban Rotnik
|
293eef01c1
|
Merge branch 'ur-SCI-2925-copy-experiment-refactor'
|
2019-01-31 07:23:06 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +01:00 |
|
mz3944
|
2ae56eb13f
|
Merge pull request #1448 from mz3944/mz-SCI-2929
Can not switch team [SCI-2929]
|
2019-01-31 04:43:39 +01:00 |
|