Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
35aafa9
Added status column for resources
iampham Jan 28, 2018
0ec4365
Updated ResourceController, created TopicController
iampham Jan 28, 2018
70b44ec
partial complete of checkbox 1 in issue #28
aryarm Feb 3, 2018
e40df73
Changed how author id is retrieved from $request->authorid to Auth::id()
iampham Feb 4, 2018
4bea42b
Working on a function that moves topics, move, located in resources. …
iampham Feb 4, 2018
c2c84cd
Merge branch 'laravel_dev' into adminpage
aryarm Feb 8, 2018
dee11bb
Created a descendants() function in Topic.php, which mostly completed…
iampham Feb 11, 2018
797835a
Revised Topic.php descendants() function to actually return the corre…
iampham Feb 11, 2018
d4fd07a
added TopicRepository and registered it
aryarm Feb 18, 2018
b96f30e
added TopicRepository and registered it
aryarm Feb 18, 2018
950a713
brought tree-data-fix into adminpage code
aryarm Feb 18, 2018
0f84305
Merge branch 'laravel_dev' into adminpage
aryarm Feb 18, 2018
53a643d
started TopicRepository
aryarm Feb 24, 2018
ce6fbe3
Merge branch 'laravel_dev' into adminpage
aryarm Feb 24, 2018
33026be
had to delete fonts.scss
aryarm Feb 24, 2018
6d03362
these files disappeared for some reason. I'm adding them back
aryarm Feb 25, 2018
682346f
Revert "Merge branch 'laravel_dev' into adminpage"
aryarm Feb 25, 2018
0a1cf00
second phase of reverting prior commits
aryarm Feb 25, 2018
8787610
new changes to Topic Repository. moved functions out of Topic model
aryarm Feb 25, 2018
4d39838
moved getTopLevelTopics out of Topic model and rewrote descendants() …
aryarm Mar 3, 2018
9e53210
had TopicRepository use collections as its data structure
aryarm Mar 4, 2018
eb232f5
finished TopicTreeController functions for processing topics, resourc…
aryarm Mar 14, 2018
8397bf1
started working on ResourceRepositoryin issue #32
aryarm Mar 22, 2018
0040e5a
almost finished rewriting all functions in the ResourceRepository. se…
aryarm Mar 24, 2018
733042b
created getByTopics() for ResourceRepository. see issue #32
aryarm Mar 24, 2018
ce75ad9
fixed attachTopics(). see issue #32
aryarm Mar 25, 2018
9b1da1c
started to make TopicRepository return pure data. see issue #32
aryarm Mar 31, 2018
24f5f72
the TopicRepository now returns pure data (#32)
aryarm Mar 31, 2018
234deed
Worked on moveTopics function in ResourceRepository
iampham Apr 1, 2018
393009e
finished TopicRepository refactor. see issue #32
aryarm Apr 1, 2018
8fc0a63
tested getByTopics() in ResourceRepository (#32)
aryarm Apr 1, 2018
06eb175
finished TopicTreeController refactor. resources are now returned in …
aryarm Apr 7, 2018
3cf29f2
finished Topic and Resource refactor (#32)
aryarm Apr 7, 2018
45789f8
changes to moveTopic
iampham Apr 8, 2018
24a9d5f
Merge branch 'adminpage' of http://www.github.com/aryam7/studycloud into
iampham Apr 8, 2018
14695d7
made progress on moveTopics() (#32)
aryarm Apr 15, 2018
67212f5
decided to use ['stuff'] notation instead of ->get('stuff') for colle…
aryarm Apr 21, 2018
640c9d9
gave up on fixing issue #32. I'll come back to it later
aryarm Apr 22, 2018
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
Prev Previous commit
Next Next commit
Merge branch 'laravel_dev' into adminpage
  • Loading branch information
aryarm committed Feb 8, 2018
commit c2c84cdd2e8ea14febc4fb2996ad60ec222aee48

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.