Diffusion kolab-chat 4627255dbe44

Merge branch 'feature/dummy_auth' into develop
4627255dbe44
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'feature/dummy_auth' into develop

Conflicts:
web/router.ex
web/templates/layout/app.html.eex

Details

Provenance

machniak	Authored on Dec 12 2016, 11:13 AM
machniak	Pushed on Dec 12 2016, 11:16 AM

Parents

rKC2a7f04e70712: T2018: Dummy authentication module
rKC526caff7f000: T1949: Added localization module

Branches

Unknown

Tags

Unknown

Build Status

Buildable 7173
Build 7329: Continuous Integration for Software Development Projects

Event Timeline

machniak committed rKC4627255dbe44: Merge branch 'feature/dummy_auth' into develop (authored by machniak).Dec 12 2016, 11:13 AM

Harbormaster failed to build B7173: rKC4627255dbe44: Merge branch 'feature/dummy_auth' into develop!Aug 29 2023, 4:25 PM

Merged Changes

2a7f04e70712 T2018: Dummy authentication module
Author
machniak
Revisions
D333: T2018: Dummy authentication module
Browse Repository
Failed
No Audits

Changes (6)

Path

Size

web/

controllers/

auth_controller.ex

static/

css/

templates/

layout/

rKC4627255dbe44

web/controllers/auth_controller.ex

Loading...

web/controllers/plugs/set_user.ex

Loading...

web/router.ex

Loading...

web/static/css/app.css

Loading...

web/templates/layout/app.html.eex

Loading...