Commit graph

4729 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
95cb6db4df Fix test [SCI-2733] 2018-10-19 10:47:55 +02:00
Alex Kriuchykhin
e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770
Add request rate throttling for API [SCI-2770]
2018-10-19 09:38:31 +02:00
Jure Grabnar
bd5a2a43fd Add can_export_project? permission
Closes [SCI-2805].
2018-10-19 08:41:39 +02:00
mlorb
e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Luka Murn
08c218e530 Merge remote-tracking branch 'upstream/core-api' into core-api 2018-10-17 14:35:57 +02:00
Oleksii Kriuchykhin
c2e36580ce Add tests for CREATE Result endpoint [SCI-2749] 2018-10-17 14:17:16 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
Implement inventory column data type name mappings [SCI-2772]
2018-10-17 10:37:23 +02:00
Alex Kriuchykhin
5487999cec
Merge pull request #1328 from okriuchykhin/ok_SCI_2765
Add CRUD endpoints for inventory cells [SCI-2765]
2018-10-16 19:34:45 +02:00
Oleksii Kriuchykhin
b833ff6616 Rename MyModule serializer in tests [SCI-2742] 2018-10-16 17:45:29 +02:00
Oleksii Kriuchykhin
e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin
df217de341 Update Gemfile.lock file [SCI-2742] 2018-10-16 17:15:42 +02:00
Oleksii Kriuchykhin
b9320b3b1d Update sdoc gem [SCI-2765] 2018-10-16 16:50:42 +02:00
Oleksii Kriuchykhin
cf37566e8f Update Gemfile.lock [SCI-2765] 2018-10-16 16:06:03 +02:00
Oleksii Kriuchykhin
ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Jure Grabnar
00139beb89
Merge pull request #1332 from jbargu/jg_export_all_modal
Export projects modal [SCI-2645]
2018-10-16 13:48:52 +02:00
Luka Murn
3126f7c238 Merge branch 'ok_SCI_2765' of https://github.com/okriuchykhin/scinote-web into core-api
Conflicts:
	app/serializers/api/v1/repository_asset_value_serializer.rb
2018-10-16 13:17:14 +02:00
Oleksii Kriuchykhin
947ccdf169 Update ruby to 2.4.4 [SCI-2742] 2018-10-16 13:08:13 +02:00
Oleksii Kriuchykhin
f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Jure Grabnar
db55e300b0 Merge branch 'jg_export_all_modal' of github.com:jbargu/scinote-web into jg_export_all_modal 2018-10-16 11:34:21 +02:00
Jure Grabnar
c13e7531ea Change generate_team method name 2018-10-16 11:13:01 +02:00
Jure Grabnar
447cad083d Fix formatting according to HoundBot 2018-10-16 11:01:58 +02:00
Jure Grabnar
d50f56e319 Disable/enable export proejct button
Fix filesystem saving
2018-10-16 11:01:58 +02:00
Jure Grabnar
ed16e8d479 Fix reviewers errors 2018-10-16 11:00:38 +02:00
Jure Grabnar
6b47165ac1 Fix formatting according to Houndbot 2018-10-16 11:00:38 +02:00
Jure Grabnar
2558b7a313 Fix formatting according to HoundBot 2018-10-16 11:00:38 +02:00
Jure Grabnar
1761d57b9d Add reset_export_projects_counter rake task 2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98 Add export project modal
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Jure Grabnar
1c7cc9369c Fix formatting according to HoundBot 2018-10-15 21:44:24 +02:00
Jure Grabnar
afbe70a2e2 Disable/enable export proejct button
Fix filesystem saving
2018-10-15 21:40:59 +02:00
Oleksii Kriuchykhin
0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +02:00
Luka Murn
e22eddcd13 Merge branch 'ok_SCI_2765' of https://github.com/okriuchykhin/scinote-web into core-api
Conflicts:
	app/serializers/api/v1/repository_asset_value_serializer.rb
2018-10-15 15:45:23 +02:00
Luka Murn
5190ac7a08 Merge branch 'Ducz0r-lm-api-fixes' into core-api 2018-10-15 15:21:00 +02:00
Luka Murn
1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
2018-10-15 15:20:26 +02:00
Jure Grabnar
38dc07353e Fix reviewers errors 2018-10-15 14:25:12 +02:00
Jure Grabnar
b9bb0db62d
Merge pull request #1314 from mz3944/mz-SCI-2752
Render SciNote tables within exported PDF as using HTML Tables [SCI-2752]
2018-10-15 10:03:42 +02:00
Jure Grabnar
91f2ab62bb
Merge pull request #1308 from mz3944/mz-SCI-2641
Export all - PDF (or HTML) report [SCI-2641] [WIP]
2018-10-15 09:59:24 +02:00
mz3944
306451a97d
Merge pull request #1 from jbargu/mz3944-mz-SCI-2641
Fix inventories attachment/CSV file path
2018-10-15 09:45:07 +02:00
Jure Grabnar
ab71471a49 Fix inventories attachment/CSV file path 2018-10-15 08:55:00 +02:00
Matej Zrimšek
ef5bf42fc2 Refactor table styling for export all PDF; remove 'min-width' from table cells to also display bigger tables nicely 2018-10-15 08:00:04 +02:00
Matej Zrimšek
7fe6837206 Style tables in export all PDF (in same way as in PDF reports) [SCI-2752] 2018-10-15 07:59:28 +02:00
Matej Zrimšek
97e6fe34a1 Add unstyled tables to the export all PDF [SCI-2752] 2018-10-15 07:58:44 +02:00
Matej Zrimšek
46da1e6b7d Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641] 2018-10-15 07:13:41 +02:00
Matej Zrimšek
9fb5520970 Refactor/match exported filenames in export all PDF [SCI-2641] 2018-10-15 05:54:19 +02:00
Matej Zrimšek
17380ba0ca Refactoring rebased code [SCI-2641] 2018-10-15 01:12:25 +02:00
Matej Zrimšek
1bf16537f6 Add PDF content to the export all ZIP [SCI-2641] 2018-10-14 23:56:10 +02:00
Matej Zrimšek
48a6a64502 Move PDF generation and export logic of export all PDF to the model 2018-10-14 22:52:54 +02:00
Oleksii Kriuchykhin
dd17f1d5ad Add project READ endpoints [SCI-2742] 2018-10-12 17:43:36 +02:00
Oleksii Kriuchykhin
1cafbd8c50 Move generic code to Viewable Concern [SCI-2733] 2018-10-12 16:14:24 +02:00
Oleksii Kriuchykhin
f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00