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 |
|