Skip to content

update master with code from laravel_dev#35

Merged
aryarm merged 29 commits intomasterfrom
laravel_dev
Feb 11, 2018
Merged

update master with code from laravel_dev#35
aryarm merged 29 commits intomasterfrom
laravel_dev

Conversation

@aryarm
Copy link
Copy Markdown
Member

@aryarm aryarm commented Feb 11, 2018

This resolves #28. This merge will

  • set the standard composer.lock file. after this merge, everybody should make their composer.lock files match the one on master. after doing that, make sure to run the composer install command in the Code directory
  • introduce preliminary work on the new authentication system. for the complete state of work on the authentication system, see the UserController branch
  • make the tree data request available to the javascript team. the current request is /tree/data?topic={topic_id}&levels={levels}. see issue git to-do's #28 for more info on the changes.
  • introduce code for the new ResourceController

aryarm and others added 29 commits September 22, 2017 20:32
updated laravel. everybody should run 'composer install'
changed url for getting tree data
@aryarm aryarm merged commit b1affc0 into master Feb 11, 2018
aryarm added a commit that referenced this pull request Feb 11, 2018
resolves #35 and resolves #28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

git to-do's

2 participants