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.

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

Refactoring #340

Merged
merged 27 commits into from Apr 22, 2013
Merged

Refactoring #340

merged 27 commits into from Apr 22, 2013

Conversation

eurich
Copy link
Member

@eurich eurich commented Apr 19, 2013

Refactoring for:

  • ManagePosts Controller
  • ManageRegistration Controller
  • ManageScheduledTasks Controller

Redesigned the getBasicMemergroupsData function as well.

Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
…ngrouped members" option.

Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
…embergroupdata();

Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
@norv
Copy link
Contributor

norv commented Apr 21, 2013

Oops, sorry, @eurich I'm afraid Github doesn't want to automatically merge, and I have no time atm to check what's wrong. Could you please eventually merge the master again, in this branch?

Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
@eurich
Copy link
Member Author

eurich commented Apr 22, 2013

@norv: mhh, not sure if it was a good idea to just do a "git pull upstream master".. I've solved the conflicts and committed the changes. Maybe I should have used the --rebase param?
If the PR is still in a state where it can't be merged I would close the PR, pick the file changes and create a new branch with a new pull request..

norv added a commit that referenced this pull request Apr 22, 2013
@norv norv merged commit 58f43dc into elkarte:master Apr 22, 2013
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.

None yet

2 participants