Mojca Lorber
|
343a46584f
|
Rename scope
|
2019-02-14 14:54:04 +01:00 |
|
Mojca Lorber
|
0e14c126e5
|
Add scope instead of method for active my_module_group
|
2019-02-14 10:53:48 +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 |
|
Oleksii Kriuchykhin
|
da30d187a6
|
Create templates project when syncing templates if team doesn't have it [SCI-3039]
|
2019-02-13 15:17:33 +01:00 |
|
Oleksii Kriuchykhin
|
f3ad4f7fc9
|
Fix failing test [SCI-3037]
|
2019-02-12 13:39:38 +01:00 |
|
Mojca Lorber
|
d706a18e2d
|
Add flag for archived tasks to experiment exporter
|
2019-02-12 13:29:48 +01:00 |
|
Oleksii Kriuchykhin
|
7854b9d281
|
Merge branch 'features/templates' into ok_SCI_3037
|
2019-02-12 11:18:31 +01:00 |
|
Oleksii Kriuchykhin
|
445098fe45
|
Fix protocols in team export service [SCI-3037]
|
2019-02-12 10:56:15 +01:00 |
|
Alex Kriuchykhin
|
b71c9d96a2
|
Merge pull request #1476 from okriuchykhin/ok_SCI_2944
Add test for templates service [SCI-2944]
|
2019-02-12 09:39:03 +01:00 |
|
Jure Grabnar
|
0fa403d6b0
|
Refactor tests fro experiment import
Closes [SCI-2946]
|
2019-02-06 14:27:43 +01:00 |
|
Matej Zrimšek
|
f68adf1e5e
|
Fix workflow image loading for moved experiments [SCI-3003]
|
2019-02-06 07:51:43 +01:00 |
|
Oleksii Kriuchykhin
|
19f1585352
|
Add test for templates service [SCI-2944]
|
2019-02-01 18:06:36 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +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 |
|
Luka Murn
|
1f7bca485a
|
Merge pull request #1471 from biosistemika/master
Merge master into features/templates
|
2019-01-29 10:14:09 +01:00 |
|
Oleksii Kriuchykhin
|
f7b73c617a
|
Fix code styling [SCI-2939]
|
2019-01-28 15:37:24 +01:00 |
|
Urban Rotnik
|
4cf12d12d1
|
Refactor 'move_experiment' method into service object
Jira Ticket: SCI-2926
|
2019-01-28 11:45:36 +01:00 |
|
Oleksii Kriuchykhin
|
bd2efa55ac
|
Add templates business logic [SCI-2939]
|
2019-01-25 10:55:08 +01:00 |
|
Urban Rotnik
|
f1d59e65f3
|
Add module and rename service object
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
47cc6a9d10
|
Refactor workflow_image_generation and move to service class
|
2019-01-18 16:56:33 +01:00 |
|
Oleksii Kriuchykhin
|
fdf7db425b
|
Merge branch 'master' into features/templates
|
2019-01-18 14:41:21 +01:00 |
|
Jure Grabnar
|
761932282b
|
Fix Hound formatting
Closes SCI-2937
|
2019-01-16 16:11:38 +01:00 |
|
Jure Grabnar
|
d1f966ee05
|
Add importing of the experiment templates
|
2019-01-16 15:54:03 +01:00 |
|
Jure Grabnar
|
5b496a85d3
|
Experiment exporting works
|
2019-01-16 08:37:05 +01:00 |
|
Jure Grabnar
|
0184c97c61
|
Refactor TeamExporter into ModelExporter
|
2019-01-16 08:00:01 +01:00 |
|
Jure Grabnar
|
ff17a7e367
|
Fix S3_BUCKET not being defined
|
2019-01-14 16:49:08 +01:00 |
|
Alex Kriuchykhin
|
c2b38af91e
|
Merge pull request #1439 from okriuchykhin/ok_SCI_2888
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-10 11:05:07 +01:00 |
|
Oleksii Kriuchykhin
|
6a64b23f90
|
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-04 10:44:38 +01:00 |
|
Oleksii Kriuchykhin
|
d5c07fd22a
|
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-13 16:17:22 +01:00 |
|
Luka Murn
|
f56847e44a
|
Refactor team importer to use closed File.open blocks
|
2018-12-05 18:34:32 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Oleksii Kriuchykhin
|
7642d8d472
|
Fix sorting on projects table [SCI-2860]
|
2018-11-15 10:36:37 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
mz3944
|
056efe170b
|
Merge pull request #1358 from mz3944/mz-SCI-2646
Removal of the temporary files for export all [SCI-2646]
|
2018-11-13 20:31:04 +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
|
145c66a834
|
Fix user counters on projects overview page [SCI-2847]
|
2018-11-12 11:52:38 +01:00 |
|
Oleksii Kriuchykhin
|
8d0dbc7076
|
Add time format selection to settings [SCI-2778]
|
2018-11-09 16:19:40 +01:00 |
|
Oleksii Kriuchykhin
|
1feb13c74a
|
Improve counters on projects overview table [SCI-2785]
|
2018-11-07 22:27:57 +01:00 |
|
Matej Zrimšek
|
8fe0249f45
|
Fix test for repository ZIP export & return path for ZIP exports [SCI-2646]
|
2018-11-07 05:04:29 +01:00 |
|
Alex Kriuchykhin
|
2b4ef619c2
|
Merge pull request #1345 from okriuchykhin/ok_SCI_2785
Show all experiments and tasks for archived projects [SCI-2785]
|
2018-10-29 11:56:38 +01:00 |
|
Oleksii Kriuchykhin
|
04ff5870af
|
Rename user_id to sub in JWT [SCI-2814]
|
2018-10-28 14:34:51 +01:00 |
|
Oleksii Kriuchykhin
|
e9a8826a1e
|
Show all experiments and tasks for archived projects [SCI-2785]
|
2018-10-24 18:49:59 +02:00 |
|
Matej Zrimšek
|
c8d170f9ec
|
Add default page size when it's not in request params when fetching projects
|
2018-10-23 19:51:50 +02:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Jure Grabnar
|
26df1e5a98
|
Add export project modal
Closes [SCI-2645]
|
2018-10-16 11:00:38 +02:00 |
|
Matej Zrimšek
|
1bf16537f6
|
Add PDF content to the export all ZIP [SCI-2641]
|
2018-10-14 23:56:10 +02:00 |
|
Oleksii Kriuchykhin
|
f221d71bbc
|
Fix datatables state restore [SCI-2733]
|
2018-10-12 15:15:43 +02:00 |
|
Oleksii Kriuchykhin
|
8cf59d8d22
|
Add request rate throttling for API [SCI-2770]
|
2018-10-11 09:48:06 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
Alex Kriuchykhin
|
16b29b50a5
|
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
Add Projects view - list/table view [SCI-2731]
|
2018-10-08 17:53:35 +02:00 |
|
Jure Grabnar
|
d7c875135e
|
Merge pull request #1304 from jbargu/jg_zipfile_structure
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
|
2018-10-05 15:36:56 +02:00 |
|
Oleksii Kriuchykhin
|
492a5de19e
|
Add Projects view - list/table view [SCI-2731]
|
2018-10-01 15:39:42 +02:00 |
|
Jure Grabnar
|
553ac4c360
|
Refactor code according to PR review
PR review: https://github.com/biosistemika/scinote-web/pull/1304
Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
|
2018-09-30 16:37:18 +02:00 |
|
Oleksii Kriuchykhin
|
2508394924
|
Refactor Projects view - cards view [SCI-2730]
|
2018-09-27 10:43:44 +02:00 |
|
Jure Grabnar
|
a3d7d37081
|
Format according to Hound bot #2
|
2018-09-23 11:30:20 +02:00 |
|
Jure Grabnar
|
64a6ed7ffe
|
Format according to houndbot
|
2018-09-23 11:14:59 +02:00 |
|
Oleksii Kriuchykhin
|
7f7ece2be0
|
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
|
2018-09-21 17:46:18 +02:00 |
|
Oleksii Kriuchykhin
|
84428b37c2
|
Add project view JSON endpoints [SCI-2728]
|
2018-09-21 10:39:20 +02:00 |
|
Jure Grabnar
|
d783c34d33
|
Clean some minor artefacts
|
2018-09-16 23:52:36 +02:00 |
|
Jure Grabnar
|
f8b1db7f72
|
Fix repository export and relative hyperlinks
|
2018-09-16 23:01:44 +02:00 |
|
Jure Grabnar
|
449aa12070
|
Refactor TeamZipExport code (move it into special file)
|
2018-09-16 20:28:26 +02:00 |
|
Oleksii Kriuchykhin
|
49e788a9ad
|
Mergre latest core-api [SCI-2515]
|
2018-09-14 10:24:05 +02:00 |
|
Oleksii Kriuchykhin
|
c8abb3d9b8
|
Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]
|
2018-08-24 15:27:59 +02:00 |
|
Oleksii Kriuchykhin
|
0322316d74
|
Make API V1 togglable [SCI-2686]
|
2018-08-24 12:11:28 +02:00 |
|
Jure Grabnar
|
295c6a9432
|
Add export all functionality (basic skeleton)
|
2018-08-21 21:07:45 +02:00 |
|
Oleksii Kriuchykhin
|
ecde634a2c
|
Add OAuth2 provider [SCI-2515]
|
2018-08-17 13:17:59 +02:00 |
|
Alex Kriuchykhin
|
422baaf64a
|
Merge pull request #1258 from okriuchykhin/ok_SCI_2619
Add team deletion service [SCI-2619]
|
2018-08-17 10:56:11 +02:00 |
|
Oleksii Kriuchykhin
|
ca6fc84ae2
|
Remove duplicated task outputs deletion [SCI-2619]
|
2018-08-10 16:43:40 +02:00 |
|
Alex Kriuchykhin
|
6004f8411b
|
Merge pull request #1260 from okriuchykhin/ok_SCI_2611
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
|
2018-08-08 16:59:42 +02:00 |
|
Oleksii Kriuchykhin
|
298b866df4
|
Fix failing tests [SCI-2611][SCI-2612]
|
2018-08-07 14:58:02 +02:00 |
|
okriuchykhin
|
dd9090efef
|
Merge pull request #1253 from okriuchykhin/ok_SCI_2608
Adds API authentication with Azure AD [SCI-2608]
|
2018-08-02 11:28:18 +02:00 |
|
Oleksii Kriuchykhin
|
bc1cd39229
|
Add team deletion service [SCI-2619]
|
2018-07-27 13:34:13 +02:00 |
|
Oleksii Kriuchykhin
|
0e372af729
|
Adds API authentication with Azure AD [SCI-2608]
|
2018-07-24 14:21:33 +02:00 |
|
Oleksii Kriuchykhin
|
3e7fc6720c
|
Fix team import service
|
2018-07-20 16:10:45 +02:00 |
|
Luka Murn
|
f67b8d05c7
|
Merge pull request #1225 from okriuchykhin/ok_SCI_2534
Fix rendering permissions of inventory annotations [SCI-2534]
|
2018-07-13 15:18:59 +02:00 |
|
Zmago Devetak
|
00ed339520
|
Merge pull request #1233 from ZmagoD/zd_SCI_2589
fixes bug with xslx files with numeric values [fixes SCI-2589]
|
2018-07-06 11:08:27 +02:00 |
|
zmagod
|
c0d276ebee
|
fixes bug with xslx files with numeric values [fixes SCI-2589]
|
2018-07-05 14:08:03 +02:00 |
|
Oleksii Kriuchykhin
|
42ce72170c
|
Fix inventory cell copy with file attached [SCI-2585]
|
2018-07-02 12:58:49 +02:00 |
|
Oleksii Kriuchykhin
|
6660b240c8
|
Fix rendering permissions of inventory annotations [SCI-2534]
|
2018-06-28 15:30:32 +02:00 |
|
Zmago Devetak
|
54a17e0574
|
Merge pull request #1209 from ZmagoD/zd_SCI_2165
Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]
|
2018-06-27 15:31:27 +02:00 |
|
Zmago Devetak
|
29c379dbae
|
add rep_item to update_annotation function
|
2018-06-27 15:17:02 +02:00 |
|
zmagod
|
db1944cc90
|
move maximum file size limit to an ENV variable [fixes SCI-2415]
|
2018-06-19 14:15:14 +02:00 |
|
zmagod
|
d68ae63c40
|
adds repository_items to smart annotation import
|
2018-06-19 11:58:22 +02:00 |
|
zmagod
|
fbcc788597
|
fixes per @duczOr request
|
2018-06-18 14:00:49 +02:00 |
|
zmagod
|
3d7591100a
|
adds repository row assets to team import/export [fixes SCI-2165]
|
2018-06-14 15:20:57 +02:00 |
|
zmagod
|
4a82d1e7ac
|
fixes repository items import
|
2018-06-14 14:40:43 +02:00 |
|
zmagod
|
f2c0b3aa92
|
removes samples, adds list_items
|
2018-06-13 12:45:48 +02:00 |
|
zmagod
|
9abf50e7c5
|
Limits the max. amount of rows when importing into inventories [fixes SCI-2468]
|
2018-05-31 10:45:31 +02:00 |
|
zmagod
|
c683cfdbd7
|
triggers the delayed job in the controller action, fixes smart annotations
|
2018-05-25 11:41:43 +02:00 |
|
zmagod
|
e019767e90
|
refactor save_pdf_to_inventory_item service
|
2018-05-17 13:17:19 +02:00 |
|
zmagod
|
b125863baf
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
|
2018-05-17 11:25:33 +02:00 |
|
zmagod
|
ca0c8cbb71
|
fixes typos, fixes pdf rendering
|
2018-05-17 11:21:34 +02:00 |
|
Zmago Devetak
|
8a92f1a499
|
Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3
Adds custom method that generates smart annotations name for repository
|
2018-05-16 13:23:25 +02:00 |
|
zmagod
|
4573655ec8
|
adds save PDF report to inventory feature [fixes SCI-2371]
|
2018-05-16 09:31:19 +02:00 |
|
Luka Murn
|
63b7b937bb
|
Fix a bug with table order not updating properly with col deletion
|
2018-05-15 20:44:15 +02:00 |
|
zmagod
|
3e10ff7fc5
|
add custom method that generates smart annotations name from repository name [fixes SCI-2307]
|
2018-05-04 10:44:23 +02:00 |
|
Zmago Devetak
|
9ce071693d
|
Merge pull request #1116 from ZmagoD/zd_SCI_2310
parse smart annotations in repository export [fixes SCI-2310]
|
2018-05-03 14:34:29 +02:00 |
|
Zmago Devetak
|
4fe4fea4fc
|
Merge pull request #1122 from ZmagoD/zd_SCI_2339
repository when sorting/searching bug fix [SCI-2339]
|
2018-05-03 12:05:39 +02:00 |
|
Luka Murn
|
cb6fe50832
|
Merge branch 'master' into ux-release-1
Conflicts:
app/assets/javascripts/repositories/index.js
|
2018-04-26 11:38:54 +02:00 |
|
zmagod
|
23f8f35a2c
|
a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339]
|
2018-04-26 11:05:02 +02:00 |
|
Luka Murn
|
cd04596c62
|
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
|
2018-04-25 12:37:27 +02:00 |
|
zmagod
|
7d26ce561c
|
parse smart annotations in repository export [fixes SCI-2310]
|
2018-04-24 14:53:49 +02:00 |
|
zmagod
|
efd1e470f6
|
rename smart annotations icons [fixes SCI-2307]
|
2018-04-23 12:38:54 +02:00 |
|
Luka Murn
|
c0da83c5de
|
Add some additional nil guards
|
2018-04-20 12:31:22 +02:00 |
|
Luka Murn
|
d023db16af
|
Update the destroy_column action so it properly updates all states
|
2018-04-20 12:31:22 +02:00 |
|
Luka Murn
|
21e7e7057e
|
Refactor all the methods into two new services
|
2018-04-20 12:31:22 +02:00 |
|
Luka Murn
|
5e2622ecfc
|
Change default repository state to Ruby representation
Also remove some dead code from repositories datatables
|
2018-04-20 12:31:22 +02:00 |
|
Zmago Devetak
|
6b4d786acc
|
Merge pull request #1105 from ZmagoD/zd_SCI_2307
change repository icon
|
2018-04-19 17:58:48 +02:00 |
|
zmagod
|
bb3e1b4dcf
|
change repository icon
|
2018-04-19 15:39:24 +02:00 |
|
zmagod
|
f3af8f4524
|
switch current_team to repository.team
|
2018-04-19 13:04:16 +02:00 |
|
zmagod
|
9baaad25b6
|
add current_user to cloned created_by, last_modified_by field
|
2018-04-16 12:38:25 +02:00 |
|
zmagod
|
4f21833373
|
changes per @duco 's request
|
2018-04-13 11:47:33 +02:00 |
|
zmagod
|
6291857bbf
|
enables copying of repository items [fixes SCI-2207]
|
2018-04-11 17:17:19 +02:00 |
|
zmagod
|
b51ad84ee5
|
add asset field preview/sort/search in repository table [fixes SCI-2076]
|
2018-04-06 12:03:39 +02:00 |
|
Zmago Devetak
|
d1f3a65279
|
Merge pull request #1073 from ZmagoD/zd_SCI_2206
add ID column to repository [fixes SCI-2206]
|
2018-04-04 15:39:59 +02:00 |
|
zmagod
|
e630d3113f
|
add ID column to repository [fixes SCI-2206]
|
2018-04-04 11:55:11 +02:00 |
|
zmagod
|
8a156ad91e
|
change method name
|
2018-04-03 13:05:25 +02:00 |
|
zmagod
|
7dfec94ffc
|
remove samples from smart annotations
|
2018-04-03 09:43:12 +02:00 |
|
zmagod
|
01a548e8b3
|
fix hound
|
2018-03-29 16:11:21 +02:00 |
|
zmagod
|
659a088058
|
refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]
|
2018-03-29 15:55:26 +02:00 |
|
okriuchykhin
|
13fed0411b
|
Merge pull request #1063 from biosistemika/release-1.12.11
merge release 1.12.11 branch to master
|
2018-03-27 16:19:57 +02:00 |
|
zmagod
|
064bd88584
|
fix assigned query
|
2018-03-19 17:49:09 +01:00 |
|
zmagod
|
fad4001273
|
fix edit row action
|
2018-03-16 12:27:19 +01:00 |
|
zmagod
|
1cdba5e0d3
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
|
2018-03-16 11:05:16 +01:00 |
|
okriuchykhin
|
503617b42c
|
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025
|
2018-03-13 14:44:20 +01:00 |
|
okriuchykhin
|
f14931f6a8
|
Update with latest changes on branch
|
2018-03-13 14:37:12 +01:00 |
|
okriuchykhin
|
262c21d145
|
Merge pull request #1036 from okriuchykhin/ok_SCI_2078
Implement importable selector for repository columns [SCI-2078]
|
2018-03-13 13:14:53 +01:00 |
|
Oleksii Kriuchykhin
|
be1ead22e0
|
Implement importable selector for repository columns [SCI-2078]
|
2018-03-13 11:36:05 +01:00 |
|
Oleksii Kriuchykhin
|
f5ecbecaf3
|
Fix bugs [SCI-1849]
|
2018-03-12 17:00:44 +01:00 |
|
Oleksii Kriuchykhin
|
60e3a836be
|
Fix typo in regex [SCI-1849]
|
2018-03-11 22:11:12 +01:00 |
|
Oleksii Kriuchykhin
|
ac009a29cb
|
Add annotations migrations and optimize queries [SCI-2016]
|
2018-03-11 22:06:44 +01:00 |
|
zmagod
|
22eb4121f0
|
follow @okriuchykhin 's suggestions
|
2018-03-09 15:44:42 +01:00 |
|
zmagod
|
0baa7a1f99
|
fix hound
|
2018-03-09 14:43:12 +01:00 |
|
zmagod
|
4f951f6679
|
adds unit specs for datatable service [fixes SCI-2068]
|
2018-03-09 14:22:00 +01:00 |
|
zmagod
|
26883af386
|
fix assigned ordering
|
2018-03-08 17:36:10 +01:00 |
|
zmagod
|
fb66131e29
|
setup endpoint for repository_rows paging/search
|
2018-03-06 16:32:39 +01:00 |
|
Oleksii Kriuchykhin
|
c933030b94
|
Add team export/import scripts [SCI-1849]
|
2018-03-06 11:26:30 +01:00 |
|
zmagod
|
fca01bd54f
|
refactor repository export [fixes SCI-2025]
|
2018-03-05 15:54:04 +01:00 |
|
zmagod
|
83db7ed01d
|
adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014]
|
2018-02-26 17:21:58 +01:00 |
|
zmagod
|
5922aa21a8
|
adds fetch_all_team_samples method/spec
|
2018-02-15 17:38:45 +01:00 |
|
zmagod
|
c53df21946
|
adds specs for sample_to_repository migration service
|
2018-02-15 16:56:38 +01:00 |
|
zmagod
|
e0ac8e8f91
|
extract helper methods in service
|
2018-02-15 09:36:09 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
2ddb0ea009
|
Improve XLSX parsing with Roo [SCI-1915]
|
2018-01-11 17:52:57 +01:00 |
|
Oleksii Kriuchykhin
|
1a81a99ff0
|
Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]
|
2017-12-19 16:17:11 +01:00 |
|
Oleksii Kriuchykhin
|
baf3151bb0
|
Fix notification settings accessors [SCI-1864]
|
2017-12-13 11:59:53 +01:00 |
|
Oleksii Kriuchykhin
|
84f4aba213
|
Pull latest master into gilson-iot-rails4
|
2017-11-15 15:15:26 +01:00 |
|
zmagod
|
5bc38414d1
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
|
2017-11-03 09:56:44 +01:00 |
|
zmagod
|
e0323a0a46
|
fixes failing tests
|
2017-10-27 09:35:39 +02:00 |
|
zmagod
|
c36fcb1fa4
|
fixes user invitation button [fixes SCI-1726]
|
2017-10-25 11:31:32 +02:00 |
|
Luka Murn
|
c026b60790
|
Update Profile page to use validation
|
2017-10-23 18:04:20 +02:00 |
|
Luka Murn
|
82f982e983
|
Merge branch 'rails-5.1' into decoupling-settings-page
Conflicts:
Gemfile
Gemfile.lock
|
2017-10-23 10:59:10 +02:00 |
|
Oleksii Kriuchykhin
|
c8d2ae70fa
|
Move duplicated code to service [SCI-1665]
|
2017-10-17 14:46:16 +02:00 |
|
zmagod
|
c5978f2d86
|
adds cucumber test for profile page [fixes SCI-1572]
|
2017-10-16 16:21:52 +02:00 |
|
Oleksii Kriuchykhin
|
56f52ebfa7
|
Optimize memory usage in samples/repositories import [SCI-1665]
|
2017-10-12 14:43:25 +02:00 |
|
zmagod
|
dea69014d0
|
fixes bug with password confirmation
|
2017-10-06 09:54:17 +02:00 |
|
zmagod
|
754627efe7
|
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
|
2017-10-05 11:08:31 +02:00 |
|
zmagod
|
f492234f89
|
fixes hound allerts
|
2017-09-28 17:00:11 +02:00 |
|
mlorb
|
c358f8fa0c
|
write unit tests for invite users
|
2017-09-28 14:49:33 +02:00 |
|
zmagod
|
e2aa0d7515
|
fixes user profile
|
2017-09-26 17:29:11 +02:00 |
|
mlorb
|
4ef7b57f31
|
fix error handeling
|
2017-09-22 09:57:41 +02:00 |
|
mlorb
|
9d96bf668a
|
fix error handeling, refactoring
|
2017-09-21 16:42:56 +02:00 |
|
mlorb
|
55772a80ab
|
fix hound and refactor
|
2017-09-21 10:45:36 +02:00 |
|
mlorb
|
48c8922604
|
adds invite users modal
|
2017-09-21 10:45:35 +02:00 |
|
Luka Murn
|
5429f6bbbd
|
Fix @ZmagoD's remarks
|
2017-09-21 08:06:11 +02:00 |
|
Luka Murn
|
44877a13a5
|
Refactor services on backend. New team page is now working
|
2017-09-19 16:32:21 +02:00 |
|
Luka Murn
|
80c05e50ec
|
Semi-working version of create new team form
|
2017-09-19 16:30:26 +02:00 |
|
zmagod
|
1a00b53034
|
adds user_team tests
|
2017-09-14 13:11:19 +02:00 |
|
zmagod
|
705d07f60e
|
adds remove team action
|
2017-09-13 17:11:51 +02:00 |
|
zmagod
|
1b3b3dfea9
|
adds team members update role functionality
|
2017-09-12 17:30:13 +02:00 |
|
zmagod
|
9c01ab414c
|
refactor leave team
|
2017-09-01 17:10:43 +02:00 |
|
zmagod
|
91d2d8a935
|
adds team details view
|
2017-08-31 15:56:55 +02:00 |
|
zmagod
|
1325732b0c
|
adds specs for team controller actions
|
2017-08-30 16:18:21 +02:00 |
|
Oleksii Kriuchykhin
|
c3fceb90df
|
Backport API to Rails-4 [SCI-1579]
|
2017-08-30 13:30:41 +02:00 |
|
zmagod
|
ee054f91b8
|
adds bullet gem [fixes SCI-1578]
|
2017-08-30 09:29:45 +02:00 |
|
Luka Murn
|
13eae287bb
|
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
|
2017-08-07 11:54:45 +02:00 |
|
Luka Murn
|
ae5bccf709
|
Merge branch 'master' into rails-5.1
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
|
2017-08-07 08:45:53 +02:00 |
|
Oleksii Kriuchykhin
|
e958410261
|
Add core API using JWT authentication and tests for it [SCI-1507]
|
2017-08-03 17:00:14 +02:00 |
|
Oleksii Kriuchykhin
|
ece27b2652
|
Fix importing files with empty header cells and error messages improvements [SCI-1484]
|
2017-07-18 14:54:35 +02:00 |
|
zmagod
|
18fd5b00ba
|
fix hound
|
2017-06-21 15:01:55 +02:00 |
|
zmagod
|
f66fb49b56
|
adds import records to repositories [fixes SCI-1336]
|
2017-06-21 14:45:50 +02:00 |
|
zmagod
|
f64e1ac713
|
fix locales
|
2017-06-21 09:31:39 +02:00 |
|
zmagod
|
70fa681519
|
split the import service
|
2017-06-19 14:05:37 +02:00 |
|
zmagod
|
cee052fc19
|
added service object
|
2017-06-14 09:11:20 +02:00 |
|
zmagod
|
a865253a2e
|
first run
|
2017-06-13 08:10:10 +02:00 |
|