Commit graph

4479 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
3fd687161f Remove unused variables from activities controller [SCI-2778] 2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Luka Murn
c0940b143a Fix root page bug introduced with merge features/core-api -> master 2018-11-13 21:24:20 +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
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
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
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
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
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
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
Oleksii Kriuchykhin
daaeb385bb Fix permission helpers in delayed export job [SCI-2834] 2018-10-30 14:04:01 +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
Alex Kriuchykhin
36cd1dbb88
Merge pull request #1355 from okriuchykhin/ok_SCI_2775
Remove error message for index page and unauthenticated users [SCI-2775]
2018-10-29 11:17:30 +01:00
Alex Kriuchykhin
c1d853f7bd
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
2018-10-29 10:56:02 +01:00
Oleksii Kriuchykhin
6d5af3da8f Remove error message for index page and unauthenticated users [SCI-2775] 2018-10-28 23:19:06 +01:00
mz3944
d733f4e357
Merge pull request #1346 from mz3944/mz-SCI-2787
In project list table table is not updated when archiving/restoring project [SCI-2787]
2018-10-28 14:36:17 +01:00
Jure Grabnar
0977f5251d
Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export
Fix zero limit config on export all
2018-10-28 13:38:21 +01:00
Jure Grabnar
cab0b78afa Fix zero limit config on export all 2018-10-28 09:43:34 +01:00
Alex Kriuchykhin
802290df8b
Merge pull request #1343 from okriuchykhin/ok_SCI_2826
Skip missing files in assets [SCI-2826]
2018-10-26 14:23:23 +02:00
Alex Kriuchykhin
b51f064c28
Merge pull request #1347 from okriuchykhin/ok_SCI_2756
Remove double initialization of comments on steps [SCI-2756]
2018-10-26 14:19:58 +02:00
Jure Grabnar
7d2f2c3b5f
Merge pull request #1337 from jbargu/jg_bug_sci_2805
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
2018-10-26 11:23:57 +02:00
mz3944
ee2cc90825
Merge pull request #1324 from mz3944/mz-SCI-2732
Export all - Projects view - projects endpoints (unit tests) [SCI-2732]
2018-10-26 11:20:09 +02:00
Jure Grabnar
04b1d0e142 Remove blank line 2018-10-26 11:00:13 +02:00
Jure Grabnar
3903b4a6f2 Refactor read_project/export_project permissions 2018-10-26 10:58:59 +02:00
Alex Kriuchykhin
f581829357
Merge pull request #1339 from okriuchykhin/ok_SCI_2804
Fix relative links to files in export all PDF [SCI-2804]
2018-10-26 10:57:04 +02:00
Oleksii Kriuchykhin
6e6bb73d2f Remove double initialization of comments on steps [SCI-2756] 2018-10-26 09:29:42 +02:00
Matej Zrimšek
6447750ff7 Fix showing projects in table view when all are archived [SCI-2787] 2018-10-25 22:31:00 +02:00
Alex Kriuchykhin
ababa0b157
Merge pull request #1340 from okriuchykhin/ok_SCI_2793
Fix helpers to use with export all [SCI-2793]
2018-10-25 16:55:39 +02:00
Oleksii Kriuchykhin
e9a8826a1e Show all experiments and tasks for archived projects [SCI-2785] 2018-10-24 18:49:59 +02:00
Oleksii Kriuchykhin
641d74829a Fix issue with project dropdown caching [SCI-2783] 2018-10-24 17:52:40 +02:00