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

Refactor/chatter #122

Closed
wants to merge 50 commits into from
Closed

Refactor/chatter #122

wants to merge 50 commits into from

Conversation

IDragonfire
Copy link
Contributor

Implementation of #119

based on my friendlist branch.

IDragonfire and others added 30 commits October 28, 2014 01:50
@IDragonfire @Sheeo
Add checkbox to filter password games
92913d2
@IDragonfire
merge friendlist
68d1e9e 
some notification improvements

Note from Sheeo:

  - This is a cherry pick of bef3555b on top of develop.

Conflicts:
	res/client/client.ui
	res/notification_system/dialog.ui
	src/chat/_chatwidget.py
	src/client/_clientwindow.py
@IDragonfire
hotfix friendlist option checkbox
e02b900 
fix folder icon
@IDragonfire
remove "What this" (?) button
7a4d792
@IDragonfire
correct typo
21bc933
@IDragonfire
use signals instead of flags
243af76 
Revert parts of "hotfix friendlist option checkbox"
@IDragonfire
try to implement context menu
b5ff627
@IDragonfire
fix crash if try to fetch model index
3de4ebd
@IDragonfire
add some context action
a065283
@IDragonfire
cleanup and more actions
cbe292c 
remove modeltest
@IDragonfire
format
4d4ea62
@IDragonfire
extract client api calls (without formating)
eecf623
@Sheeo @IDragonfire
Remove diffs that got in
5c9b240
@Sheeo @IDragonfire
Uncomment ask_session
5c57da6
@Sheeo @IDragonfire
Move res files into place
ec55018
@IDragonfire
fix some rebase errors
81eb5a8
@IDragonfire
extract admin api
9823e23
@IDragonfire
revert mod power for all
5859c0c
@IDragonfire
format
f53f87d
@IDragonfire
fix more rebase errors
8dac501 
stll 30 errors left

fix more rebase errors
(cannot import client, otherwise widgets loaded before application)
@IDragonfire
extract more calls,
fc2c101 
did we need a complete interface for _clientwindow?
@IDragonfire
move remote close command into admin_action
7555155
@IDragonfire
use direct signals
7b7f02f 
remove delegates methods
comment signals and separate them
@IDragonfire
format
341b3e8
@IDragonfire
extract network communication into server_packets.py
65a5ee8
@IDragonfire
extract parts of the model
babf6a2
@IDragonfire
separate model/control and view
3c6c427
@IDragonfire
fix server_packets
7c6dded 
return directly signal
@IDragonfire
imeplement game status into friendlist
976270e
@IDragonfire
add sorting to ingame status
7cb026e
@IDragonfire
now handle correct username with clantags
590b8c2
@IDragonfire
open chat on double click
61e0dfa
@IDragonfire
show mods/admins as online
9dd2f91
@IDragonfire
fix duplication users in friendlist
8ffa42e
@IDragonfire
separate view from model
493f309
@IDragonfire
add basic model tests
07fdef4
@IDragonfire
improve model api
0eabfd8
@IDragonfire
fix bugs
7b0b8d2
@IDragonfire
integrate friendlist into the lobby
ae7ba44
@IDragonfire
remove unused friendlist column
1f8e757
@IDragonfire
remove dialog frame completely
6dff058
@IDragonfire
fix vault
deef5a5
@IDragonfire
css improvements
cf0e9ef
@IDragonfire
Merge branch 'fix/hidepasswordgames' of github.com:IDragonfire/lobby …
2a3b4cd 
…into feature/friendlist_rebase

Conflicts:
	src/games/_gameswidget.py
@IDragonfire
remove admin notification if you want to start a private chat
9e32448
@IDragonfire
color mod friends in chatter
989f761
@IDragonfire
reorder foe in chat
3125b73
@IDragonfire
refactor elevation
5d6441c
@IDragonfire
refactor into api
691e060
@IDragonfire
add player status to api
d0a1f3a
@IDragonfire
Copy link
Contributor Author

If you want not to merge the friendlist before, cherry pick

9e32448
989f761
3125b73

I did not seperate it to avoid rebasing and make the merge easier (more branches, more merge conflicts)

@Sheeo
Copy link
Member

Sheeo commented Nov 6, 2014

In the future, git checkout develop is your friend. I'll cherry pick these during the next few days.

@IDragonfire
Copy link
Contributor Author

Their is a reason I am not based on the develop branch.
I have done to much refactor that make a merge very complicated..

See my complete repo as "refactor branch".
(develop has all fixes/refactor).
If you want to have some "fixes" before refactoring you must cherry pick.

I choose this way, because otherwise I must merge/rebase between my branches.

@IDragonfire IDragonfire mentioned this pull request Nov 20, 2014
Merged
@Sheeo Sheeo closed this in 1a73520 Nov 22, 2014
ChrisKitching pushed a commit that referenced this pull request Aug 15, 2015
@IDragonfire @ChrisKitching
Reorder foe in chat
a719a04 
Closes #122

Conflicts:
	src/chat/chatter.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@IDragonfire @Sheeo @JeroenDeDauw