Merge branch 'alpha' into change_resouceType_to_collection
c5e54d9ed767
Actions

Description

Merge branch 'alpha' into change_resouceType_to_collection

Details

Auditors

Provenance

• anon	Authored on Aug 17 2016, 09:12
piotr-ptaszynski	Pushed on Jul 23 2020, 07:48

Parents

rS50ebe924c741: Merge branch 'separate_db_collections' into alpha
rS98ab594246e6: Change '.type_name' attribute to '.collection_name' in resource representation

Branches

Unknown

Tags

Unknown

Event Timeline

• anon committed rSc5e54d9ed767: Merge branch 'alpha' into change_resouceType_to_collection (authored by • anon).Aug 17 2016, 09:12

Herald added an auditor: kuba-orlik. · View Herald TranscriptJul 23 2020, 08:08

This commit now requires audit.Jul 23 2020, 08:08

kuba-orlik resigned from this commit.Jul 27 2020, 12:09

This commit no longer requires audit.Jul 27 2020, 12:09

Merged Changes

50ebe924c741 Merge branch 'separate_db_collections' into alpha
Author
• anon
Browse Repository
No Builds
No Audits
b450701cd3d8 Merge branch 'alpha' into 'separate_db_collections'
Author
kuba-orlik
Browse Repository
No Builds
No Audits
0a780e19bb81 Separate different Sealious Collections into separate DB collections
Author
kuba-orlik
Browse Repository
No Builds
No Audits
5c982dbda0ca Merge branch 'no_accept_reject_interface' into alpha
Author
• anon
Browse Repository
No Builds
No Audits
7386de4b8b42 Fix conflicts after merging alpha into no_accept_reject_interface
Author
• anon
Browse Repository
No Builds
No Audits
d4d379bebf7b Merge branch 'change_resouceType_to_collection' into alpha
Author
• anon
Browse Repository
No Builds
No Audits
2482b2700059 Empty commit to clear out Travis->Coveralls.io pipe
Author
kuba-orlik
Browse Repository
No Builds
No Audits
98988f673d9d Adjust package.json scripts so they don't try to open coverage info in the…
Author
kuba-orlik
Browse Repository
No Builds
No Audits
68024940288b Merge branch 'alpha' into no_accept_reject_interface
Author
kuba-orlik
Browse Repository
No Builds
No Audits
974b6379e9da Increase coverage
Author
kuba-orlik
Browse Repository
No Builds
No Audits
2c0efc32986c Fix field-type.text
Author
kuba-orlik
Browse Repository
No Builds
No Audits
f51d7c9453b4 Write a failing test for field-type.text
Author
kuba-orlik
Browse Repository
No Builds
No Audits
b0ee6c9b21cc Rewrite field-type tests to accomodate for 'accept, reject' removal
Author
kuba-orlik
Browse Repository
No Builds
No Audits
29ebf78c0e2f Resolve conflicts
Author
kuba-orlik
Browse Repository
No Builds
No Audits
40a81a880cb4 Merge branch 'alpha' into no_accept_reject_interface
Author
kuba-orlik
Browse Repository
No Builds
No Audits
b923ac56d1d8 Remove the 'accept, reject' interface for is_proper_value
Author
kuba-orlik
Browse Repository
No Builds
No Audits

Changes (34)

Path

Size

.travis.yml

lib/

base-chips/

field-types/

chip-types/

subject/

subject-types/

collection-subject.js

single-resource-subject.js

package.json

tests/

unit-tests/

base-chips/

field-types/

single_reference.test.js

text.test.js

username.test.js

chip-types/

field-type.test.js

util/

test-is-proper-value.js

rSc5e54d9ed767

View Options

.travis.yml

View Options

lib/base-chips/field-types/boolean.js

View Options

lib/base-chips/field-types/color.js

View Options

lib/base-chips/field-types/context.js

View Options

lib/base-chips/field-types/date.js

View Options

lib/base-chips/field-types/datetime.js

View Options

lib/base-chips/field-types/email.js

View Options

lib/base-chips/field-types/file.js

View Options

lib/base-chips/field-types/float.js

View Options

lib/base-chips/field-types/hashed-text.js

View Options

lib/base-chips/field-types/int.js

View Options

lib/base-chips/field-types/single_reference.js

View Options

lib/base-chips/field-types/text.js

View Options

lib/base-chips/field-types/username.js

View Options

lib/chip-types/field-type.js

View Options

lib/subject/subject-types/collection-subject.js

View Options

lib/subject/subject-types/single-resource-subject.js

View Options

package.json

View Options

tests/unit-tests/base-chips/field-types/boolean.test.js

View Options

tests/unit-tests/base-chips/field-types/color.test.js

View Options

tests/unit-tests/base-chips/field-types/context.test.js

View Options

tests/unit-tests/base-chips/field-types/date.test.js

View Options

tests/unit-tests/base-chips/field-types/datetime.test.js

View Options

tests/unit-tests/base-chips/field-types/email.test.js

View Options

tests/unit-tests/base-chips/field-types/file.test.js

View Options

tests/unit-tests/base-chips/field-types/float.test.js

View Options

tests/unit-tests/base-chips/field-types/hashed-text.test.js

View Options

tests/unit-tests/base-chips/field-types/int.test.js

View Options

tests/unit-tests/base-chips/field-types/single_reference.test.js

View Options

tests/unit-tests/base-chips/field-types/text.test.js

View Options

tests/unit-tests/base-chips/field-types/username.test.js

View Options

tests/unit-tests/chip-types/field-type.test.js

View Options

tests/unit-tests/field-type.test.js

View Options

tests/util/test-is-proper-value.js

Merge branch 'alpha' into change_resouceType_to_collectionc5e54d9ed767Actions

Description

Details

Event Timeline

Merged Changes

Changes (34)

rSc5e54d9ed767

.travis.yml

lib/base-chips/field-types/boolean.js

lib/base-chips/field-types/color.js

lib/base-chips/field-types/context.js

lib/base-chips/field-types/date.js

lib/base-chips/field-types/datetime.js

lib/base-chips/field-types/email.js

lib/base-chips/field-types/file.js

lib/base-chips/field-types/float.js

lib/base-chips/field-types/hashed-text.js

lib/base-chips/field-types/int.js

lib/base-chips/field-types/single_reference.js

lib/base-chips/field-types/text.js

lib/base-chips/field-types/username.js

lib/chip-types/field-type.js

lib/subject/subject-types/collection-subject.js

lib/subject/subject-types/single-resource-subject.js

package.json

tests/unit-tests/base-chips/field-types/boolean.test.js

tests/unit-tests/base-chips/field-types/color.test.js

tests/unit-tests/base-chips/field-types/context.test.js

tests/unit-tests/base-chips/field-types/date.test.js

tests/unit-tests/base-chips/field-types/datetime.test.js

tests/unit-tests/base-chips/field-types/email.test.js

tests/unit-tests/base-chips/field-types/file.test.js

tests/unit-tests/base-chips/field-types/float.test.js

tests/unit-tests/base-chips/field-types/hashed-text.test.js

tests/unit-tests/base-chips/field-types/int.test.js

tests/unit-tests/base-chips/field-types/single_reference.test.js

tests/unit-tests/base-chips/field-types/text.test.js

tests/unit-tests/base-chips/field-types/username.test.js

tests/unit-tests/chip-types/field-type.test.js

tests/unit-tests/field-type.test.js

tests/util/test-is-proper-value.js

Merge branch 'alpha' into change_resouceType_to_collection
c5e54d9ed767
Actions