Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Demo server #152

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Demo server #152

wants to merge 16 commits into from

Commits on May 26, 2016

  1. DemoServer files

    @X2Jake
    X2Jake committed May 26, 2016
    Configuration menu
    Copy the full SHA
    e85d45e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'DemoServer' of github.com:X2Engine/X2CRM into DemoServer

    @X2Jake
    X2Jake committed May 26, 2016
    Configuration menu
    Copy the full SHA
    249becc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. Merge tag '6.0.2' into DemoServer 

    Conflicts:
	x2engine/protected/controllers/SiteController.php
    @X2Jake
    X2Jake committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    c816946 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2016

  1. Merge tag '6.0.3' into DemoServer

    @X2Jake
    X2Jake committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    e732f98 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Merge tag '6.0.4' into DemoServer

    @X2Jake
    X2Jake committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    f3908be View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. Merge tag '6.5' into DemoServer

    @raymondcolebaugh
    raymondcolebaugh committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    fafa795 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2016

  1. Merge tag '6.5.1' into DemoServer

    @raymondcolebaugh
    raymondcolebaugh committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    4650e97 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2016

  1. Merge tag '6.5.2' into DemoServer 

    Conflicts:
	x2engine/themes/x2engine/css/login.css
    @raymondcolebaugh
    raymondcolebaugh committed Dec 23, 2016
    Configuration menu
    Copy the full SHA
    e47cfb7 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2017

  1. added helper functions to make activity posts easier, refresh tailore… 

    …d to developer instance
    @isaiah-solo
    isaiah-solo committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    9101995 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2017

  1. added both event and notification data, posts display random phrases

    @isaiah-solo
    isaiah-solo committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    04cadf3 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. added different event data: pm and location

    @isaiah-solo
    isaiah-solo committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    eec2918 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2017

  1. Demo more refined

    @isaiah-solo
    isaiah-solo committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    87ae40f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. changes for merge to demo branch

    @isaiah-solo
    isaiah-solo committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    1b4bfa8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #118 from X2Engine/isaiah_demo 

    Immersive demo experience
    @isaiahx2
    isaiahx2 authored Apr 19, 2017
    Configuration menu
    Copy the full SHA
    80b7368 View commit details
    Browse the repository at this point in the history

  3. combined all immersive demo into one file

    @isaiah-solo
    isaiah-solo committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    ac55cb0 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Merge pull request #119 from X2Engine/isaiah_demo 

    combined all immersive demo into one file
    @isaiahx2
    isaiahx2 authored Apr 20, 2017
    Configuration menu
    Copy the full SHA
    d86459b View commit details
    Browse the repository at this point in the history