scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 09:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
5056 commits 69 branches 179 tags 165 MiB
Commit graph

5056 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Kriuchykhin 126fa03305
Merge pull request #1349 from okriuchykhin/ok_SCI_2818 
Fix project index endpoint permission bug [SCI-2818]
 2018-10-29 14:59:22 +01:00
Alex Kriuchykhin 1083ce61fb
Merge pull request #1352 from okriuchykhin/ok_SCI_2814 
Rename user_id to sub in JWT [SCI-2814]
 2018-10-29 14:54:00 +01:00
Alex Kriuchykhin d0804c8969
Merge pull request #1350 from okriuchykhin/ok_SCI_2821 
Fix relationships in activities serializer [SCI-2821]
 2018-10-29 14:53:15 +01:00
Alex Kriuchykhin 098b18b405
Merge pull request #1348 from okriuchykhin/ok_SCI_2782 
Fix inventory column creation permission check [SCI-2782]
 2018-10-29 14:52:57 +01:00
Alex Kriuchykhin 4320af794b
Merge pull request #1353 from okriuchykhin/ok_SCI_2771 
Fix API endpoints that return file URLs [SCI-2771]
 2018-10-29 13:44:55 +01:00
Alex Kriuchykhin 8f33275b35
Merge pull request #1354 from okriuchykhin/ok_SCI_2820 
Fix project start day in serializer [SCI-2820]
 2018-10-29 13:44:41 +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
Luka Murn e412d43714 Merge remote-tracking branch 'upstream/core-api' into core-api 2018-10-29 11:30:40 +01:00
mlorb 0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +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
Oleksii Kriuchykhin 5708e9bbe7 Fix project start day in serializer [SCI-2820] 2018-10-28 19:02:44 +01:00
Oleksii Kriuchykhin d1e6c64d5e Fix API endpoints that return file URLs [SCI-2771] 2018-10-28 18:39:34 +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
Oleksii Kriuchykhin 04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +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
Oleksii Kriuchykhin 012447d762 Fix relationships in activities serializer [SCI-2821] 2018-10-26 17:30:04 +02:00
Oleksii Kriuchykhin 9ad2718f32 Fix project index endpoint permission bug [SCI-2818] 2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin 93e7c3f390 Fix inventory column creation permission check [SCI-2782] 2018-10-26 14:38:47 +02: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