Skip to content

Supporting release for Connect 2.4.9 #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Feb 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d20e689
Merge pull request #223 from topcoder-platform/hotfix/increased_timou…
RishiRajSahu Jan 15, 2019
c2c8797
Merge pull request #230 from topcoder-platform/hotfix/debug_logs
Jan 16, 2019
596917b
Added debug log.
RishiRajSahu Jan 16, 2019
74a8701
updated check for adding user as observer
RishiRajSahu Jan 16, 2019
9825613
Temporary add some details the error message to quickly debug #235
maxceem Jan 22, 2019
c05e71f
Revert "Temporary add some details the error message to quickly debug…
maxceem Jan 22, 2019
ecdea1f
Merge pull request #238 from topcoder-platform/hotfix/adding_refcode_…
Jan 23, 2019
a387540
winning submission from challenge 30081357 - Topcoder Connect - Organ…
maxceem Jan 30, 2019
e889c24
Merge pull request #242 from topcoder-platform/feature/org-configs
Jan 30, 2019
86032fb
Move orgConfig path to metadata resource
Jan 30, 2019
b29a6c6
lint fix
Jan 30, 2019
a466252
lint fix
Jan 30, 2019
faf9578
Organization config final fixes
phoenix303 Jan 31, 2019
1e76dca
Merge pull request #243 from phoenix303/final-fixes
maxceem Feb 1, 2019
6cb4b87
fix URL for orgConfig in postman and swagger
maxceem Feb 1, 2019
3a0db80
fixed tests to reflect that filter with orgId is now required
maxceem Feb 1, 2019
8559af1
Merge pull request #244 from topcoder-platform/feature/org-config-fin…
Feb 1, 2019
9896462
Trying to fix the merge of priceConfig. It should just override the c…
Feb 7, 2019
2f57df8
lint fix
Feb 7, 2019
b246a4d
attachment persmissions challenge
gondzo Feb 9, 2019
3f88ca1
remove debug code
gondzo Feb 9, 2019
c01c0c4
rename userIds field to allowedUsers
gondzo Feb 9, 2019
a42212f
deploy feature branch
gondzo Feb 9, 2019
cc4cd9c
Merge branch 'dev' into feature/attachmentPermissions
gondzo Feb 9, 2019
4b5f7fe
fix test
gondzo Feb 9, 2019
1d2bba2
Merge branch 'feature/attachmentPermissions' of https://github.com/to…
gondzo Feb 9, 2019
ffe159d
update swagger
gondzo Feb 9, 2019
17a8bb8
update postman
gondzo Feb 9, 2019
0782c7c
update bus api events
gondzo Feb 9, 2019
dfc63f1
limit draft phase update events to topcoder project members
gondzo Feb 9, 2019
fb45942
Merge pull request #247 from topcoder-platform/feature/attachmentPerm…
Feb 10, 2019
5a001a8
Merge pull request #249 from topcoder-platform/feature/PhaseEventPerm…
Feb 11, 2019
1f4c110
Merge branch 'master' into dev
Feb 12, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ workflows:
- test
filters:
branches:
only: ['dev']
only: ['dev', 'feature/attachmentPermissions']
- deployProd:
requires:
- test
Expand Down
1 change: 1 addition & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"idleTimeout": 1000
},
"kafkaConfig": {
"hosts": "localhost:9092"
},
"analyticsKey": "",
"VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
Expand Down
28 changes: 28 additions & 0 deletions migrations/20190129_organization_config.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--
-- CREATE NEW TABLE:
-- org_config
--
CREATE TABLE org_config (
id bigint NOT NULL,
"orgId" character varying(45) NOT NULL,
"configName" character varying(45) NOT NULL,
"configValue" character varying(512),
"deletedAt" timestamp with time zone,
"createdAt" timestamp with time zone,
"updatedAt" timestamp with time zone,
"deletedBy" bigint,
"createdBy" bigint NOT NULL,
"updatedBy" bigint NOT NULL
);

CREATE SEQUENCE org_config_id_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;

ALTER SEQUENCE org_config_id_seq OWNED BY org_config.id;

ALTER TABLE org_config
ALTER COLUMN id SET DEFAULT nextval('org_config_id_seq');
4 changes: 4 additions & 0 deletions migrations/20190201_userIds_project_attachment.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
--
-- project_attachments
--
ALTER TABLE project_attachments ADD COLUMN "allowedUsers" integer[];
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading