Commit graph

6239 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin
fb309a12b9 Refactor result and step comments initialization [SCI-2830] 2018-11-13 16:57:42 +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
Jure Grabnar
7a320ae031 Update formating according to Hound 2018-11-12 17:51:23 +01:00
Alex Kriuchykhin
b16646b0b4
Merge pull request #1366 from okriuchykhin/ok_SCI_2839
Improve Export All button behaviour [SCI-2839]
2018-11-12 17:32:33 +01:00
Jure Grabnar
1c08aa6a8b Add unit tests for status/health API endpoints
Closes [SCI-2746].
2018-11-12 17:17:47 +01:00
Luka Murn
602e2c679f Merge remote-tracking branch 'upstream/core-api' into core-api 2018-11-12 17:09:17 +01:00
Oleksii Kriuchykhin
98d1ea8542 Improve Export All button behaviour [SCI-2839] 2018-11-12 15:51:03 +01:00
Alex Kriuchykhin
c9f015fa0c
Merge pull request #1365 from okriuchykhin/ok_SCI_2847
Fix user counters on projects overview page [SCI-2847]
2018-11-12 15:04: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
e89d60785f Fix dates on activities and experiments [SCI-2778] 2018-11-12 10:26:48 +01:00
mlorb
d1102a7402
Merge pull request #1363 from mlorb/ml-sci-2795
Fix user_project manage permission [SCI-2795]
2018-11-12 09:54:50 +01:00
Matej Zrimšek
57dbd63aa3 Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817] 2018-11-12 01:34:00 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
mlorb
75875e5421 fix user_project manage permission 2018-11-09 11:36:44 +01:00
Alex Kriuchykhin
a857af6c38
Merge pull request #1341 from okriuchykhin/ok_SCI_2773
Improve error messages in API [SCI-2773]
2018-11-09 09:38:20 +01:00
Alex Kriuchykhin
eb72ea69dd
Merge pull request #1361 from okriuchykhin/ok_SCI_2785_v2
Improve counters on projects overview table [SCI-2785]
2018-11-09 09:37:41 +01:00
Matej Zrimšek
2a5b36b3c2 Fix index/position for export-all folder names [SCI-2817] 2018-11-09 01:21:30 +01:00
Matej Zrimšek
6ff117d662 Fix path creation and construction for export-all [SCI-2817] 2018-11-09 00:44:17 +01:00
Matej Zrimšek
f23160ba6d Refactor logic for handling model path in export-all [SCI-2817] 2018-11-08 23:23:23 +01:00
Matej Zrimšek
58b2310d26 Add archived models in corresponding archive directory [SCI-2817] 2018-11-08 23:21:25 +01:00
Matej Zrimšek
efb4e0c549 Change indexing in task names in export-all PDF [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
dc91be3749 Preserve task order from project sidebar in export-all file structure [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
08396b2101 Make folder and file names more readable for export-all ZIP [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
d65fcdc312 Change datetime to human friendly format for ZIP exports [SCI-2817] 2018-11-08 21:48:09 +01:00
Matej Zrimšek
159f6d1ee2 Minor refactoring of exports [SCI-2646] 2018-11-08 21:39:09 +01:00
Matej Zrimšek
b7fdd82409 Ensure temp files deletion after export is done [SCI-2646] 2018-11-08 21:32:07 +01:00
mlorb
46080a2b21
Merge pull request #1360 from mlorb/ml-sci-2837
Fix empty projects page bug and projects tree bug [SCI-2837]
2018-11-08 15:00:44 +01:00
mlorb
a56d22a329
change count to size 2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin
1feb13c74a Improve counters on projects overview table [SCI-2785] 2018-11-07 22:27:57 +01:00
Oleksii Kriuchykhin
23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
Luka Murn
70bb539061 Merge remote-tracking branch 'upstream/core-api' into core-api 2018-11-07 13:52:50 +01:00
mlorb
4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
mlorb
039faf2964
Merge pull request #1359 from mlorb/ml-sci-2843
Fix bug with new project button not working [SCI-2843]
2018-11-07 11:02:47 +01:00
Alex Kriuchykhin
74d99973a5
Merge pull request #1357 from okriuchykhin/ok_SCI_2834
Fix permission helpers in delayed export job [SCI-2834]
2018-11-07 10:56:10 +01:00
Oleksii Kriuchykhin
82a11ebca2 Remove duplicate destroy for report [SCI-2834] 2018-11-07 09:55:06 +01:00
Matej Zrimšek
2f6a6072e1 Fix repository ZIP export test to work with enabled workers [SCI-2646] 2018-11-07 06:14:40 +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
mlorb
63e039e235 fix bug with new project button not working 2018-11-06 11:38:31 +01:00
Luka Murn
b9ac110574
Merge pull request #1342 from Ducz0r/lm-sci-2764
Update styling of Sign up page [SCI-2764]
2018-11-06 10:52:35 +01:00
Oleksii Kriuchykhin
0e192cc830 Ensure that temporary report is always deleted [SCI-2834] 2018-11-06 09:33:18 +01:00
Matej Zrimšek
ee611a45d9 Also remove temp file after other types of ZIP export generation [SCI-2646] 2018-11-04 01:39:16 +01:00
Matej Zrimšek
5defbdd76e Remove temp files after export-all ZIP generation [SCI-2646] 2018-11-04 01:33:50 +01:00
mlorb
ad5f4c2ebb
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint
Remove show protocol api endpoint
2018-10-30 14:04:17 +01:00
Oleksii Kriuchykhin
daaeb385bb Fix permission helpers in delayed export job [SCI-2834] 2018-10-30 14:04:01 +01:00
Alex Kriuchykhin
b2f87561fe
Merge pull request #1335 from okriuchykhin/ok_SCI_2749
Add tests for CREATE Result endpoint [SCI-2749]
2018-10-30 09:43:45 +01:00
Luka Murn
20b918de93 Merge remote-tracking branch 'upstream/core-api' into core-api 2018-10-29 16:39:11 +01:00
Alex Kriuchykhin
2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
2018-10-29 16:26:58 +01:00