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

5062 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matej Zrimšek f68adf1e5e Fix workflow image loading for moved experiments [SCI-3003] 2019-02-06 07:51:43 +01:00
Jure Grabnar 55fdd201b2 Add additional checks 2019-02-05 14:27:42 +01:00
Jure Grabnar 0a3146fbe6 Add checking of experiment basics 2019-02-05 14:27:42 +01:00
Jure Grabnar e180d5e100 Add test skeleton for importing 2019-02-05 14:27:42 +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
Oleksii Kriuchykhin 79c7bbbfb0 Fix failing tests with local file storage [SCI-2944] 2019-02-04 13:50:38 +01:00
Oleksii Kriuchykhin 19f1585352 Add test for templates service [SCI-2944] 2019-02-01 18:06:36 +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
Alex Kriuchykhin 1bd6d2a032
Merge pull request #1464 from okriuchykhin/ok_SCI_2939 
Add templates business logic [SCI-2939]
 2019-01-30 11:21:42 +01:00
Oleksii Kriuchykhin cc57a8d4ef Fix template project name generation [SCI-2939] 2019-01-30 10:56:22 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +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 1f7bca485a
Merge pull request #1471 from biosistemika/master 
Merge master into features/templates
 2019-01-29 10:14:09 +01:00
Miha Mencin 0767d8308a
Merge pull request #1469 from biosistemika/pull-request-template-file 
Pull request template file
 2019-01-29 09:09:08 +01:00
Miha Mencin 22dcfa6195
changed titles to h3 2019-01-29 09:08:52 +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
Mojca Lorber 089ec64398 fix experiment card look on Matejs request 2019-01-28 16:59:40 +01:00
Oleksii Kriuchykhin f7b73c617a Fix code styling [SCI-2939] 2019-01-28 15:37:24 +01:00
Urban Rotnik ed388db723 Merge branch 'ur-SCI-2926' 2019-01-28 11:58:35 +01:00
Miha Mencin 9926712267
Pull request template file 
**What was done:**
Added initial template file
 2019-01-28 11:51: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
Oleksii Kriuchykhin 05edfae766 Fix failing tests [SCI-2939] 2019-01-25 14:13:00 +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