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

Feature/split reloaded anime and manga #19

Merged
merged 45 commits into from
Oct 8, 2014
Merged

Feature/split reloaded anime and manga #19

merged 45 commits into from
Oct 8, 2014

Conversation

tomerghelber
Copy link
Contributor

No description provided.

tomerghelber and others added 30 commits September 23, 2014 23:11
@tomerghelber
took reloaded set outside
5f36fb6
@tomerghelber
the package name is wrong
7a59ab7
@tomerghelber
using newest reloaded-set
c6f6b53
@tomerghelber
Merge branch 'master' into feature/taking-out-reloaded-set
751b88a 
Conflicts:
	pymal/account_objects/account_friends.py
@tomerghelber
Merge branch 'develop' into feature/taking-out-reloaded-set
9a4bf69 
Conflicts:
	pymal/account_objects/account_friends.py
@tomerghelber
splitted reload to _side_bar and _main_bar
4253f82
@tomerghelber
splitted synopsis bar
dd0f2ac
@tomerghelber
some docs
92f023b
@tomerghelber
Merge branch 'develop' into feature/taking-out-reloaded-set
1d238fa 
Conflicts:
	requirements.txt
@tomerghelber
rename
a4d9c33
@tomerghelber
rename
de70b69
@tomerghelber
removed conmtatinas_id - no need to support it.
4227bd8
@tomerghelber
a new way to reset all instances.
f44c6e3
@tomerghelber
Merge pull request #15 from tomerghelber/feature/taking-out-reloaded-set
3caa9c6 
Feature/taking out reloaded set
@tomerghelber
removed unneed line
041ef37
@tomerghelber
splat requirements to regular and test. setup reading regular. added …
18fcbde 
…more dynamically calculating.
@tomerghelber
long description right now is the same as short
a94b109
@tomerghelber
we moved to github
00866cd
@tomerghelber
checking that 'reload' function wasn't called
e6c97a7
@tomerghelber
checking the reload was called once
4b852c9
@tomerghelber
testing that we still fetching web fine
9b22c51
@tomerghelber
tested reload with mocking
a1671d8
@tomerghelber
added html page of account
0ba2215
@tomerghelber
removed all lucky star unused files
f4b1ff8
@tomerghelber
Merge pull request #16 from tomerghelber/feature/mocking
431bc60 
Feature/mocking
@tomerghelber
using mocking for testing function access. still need to mock access …
f17ff21 
…to web
@tomerghelber
mocking access to web
b4885ce
@tomerghelber
Merge pull request #17 from tomerghelber/feature/mocking
a0d634e 
Feature/mocking
@tomerghelber
Merge branch 'develop' into feature/split-reloaded-anime-and-manga
4fd58b9 
Conflicts:
	pymal/anime.py
@tomerghelber
fixed docs (bs4.element without 's' in the end)
f881ea9
@coveralls
Copy link

Coverage Status

Coverage increased (+3.45%) when pulling 98bdc25 on feature/split-reloaded-anime-and-manga into 3edbb6f on master.

tomerghelber added a commit that referenced this pull request Oct 8, 2014
@tomerghelber
Merge pull request #19 from tomerghelber/feature/split-reloaded-anime…
7f55017 
…-and-manga

Feature/split reloaded anime and manga
@tomerghelber tomerghelber merged commit 7f55017 into master Oct 8, 2014
@tomerghelber tomerghelber deleted the feature/split-reloaded-anime-and-manga branch October 8, 2014 18:31
@tomerghelber tomerghelber restored the feature/split-reloaded-anime-and-manga branch October 8, 2014 18:32
@tomerghelber tomerghelber mentioned this pull request Oct 8, 2014
Merged
@tomerghelber tomerghelber deleted the feature/split-reloaded-anime-and-manga branch October 8, 2014 18:57
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.

None yet
2 participants
@tomerghelber @coveralls