aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-06-14Merge branch 'master' of github:camilstaps/RSSinCamil Staps0-0/+0
Conflicts: app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
2015-06-14Fix for sorting on a separate threadCamil Staps2-18/+68
2015-06-14Fix for sorting on a separate threadCamil Staps2-18/+62
2015-06-14Bugfix for sorting FeedItemsJos1-1/+1
hasScore should return false when score == -1, not when score == 0 because score is -1 initially.
2015-06-10ReadmeCamil Staps1-8/+1
2015-06-10GitHub link; button instead of link for article websiteCamil Staps2-8/+5
2015-06-10Merge branch 'master' into camil_workingCamil Staps3-0/+22
2015-06-10Merge branch 'camil_working' of github:camilstaps/RSSin into camil_workingCamil Staps0-0/+0
2015-06-10bugfixCamil Staps3-2/+3
2015-06-10bugfixCamil Staps2-2/+2
2015-06-10Article Linkzkwip3-0/+22
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps9-10/+21
Conflicts: app/src/main/java/org/rssin/rssin/Feed.java
2015-06-10Merge branch 'master' of http://github.com/camilstaps/RSSinSize438-10/+8
2015-06-10uniqueKey() will not return the same key twiceSize432-1/+13
2015-06-10Removed todos if not needed anymorezkwip8-10/+8
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps30-10/+39
Conflicts: app/src/main/java/org/rssin/android/FeedItemAdapter.java app/src/main/java/org/rssin/rssin/Feed.java
2015-06-10working...Camil Staps6-17/+26
2015-06-10Merge branch 'master' of http://github.com/camilstaps/RSSinSize4354-13/+20
2015-06-10Removing [OBJ] from summaries / descriptionsSize436-9/+42
2015-06-10image clean upzkwip25-0/+0
shitty cover art is gone now
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps29-13/+20
2015-06-10A warm welcome - walkthroughzkwip29-13/+20
mooi hè?
2015-06-10CleanupCamil Staps1-3/+5
2015-06-10Fixed feed titles not being storedSize435-9/+32
2015-06-10Highlighting hamburger menu itemsSize436-41/+16
2015-06-10Merge branch 'master' of http://github.com/camilstaps/RSSinSize431-5/+10
2015-06-10Merge conflict resolvedSize439-44/+57
2015-06-10Hamburgers, nom nom nomCamil Staps1-5/+10
2015-06-10Selected & press color added to hamburger menuSize434-2/+42
2015-06-10Several minor fixesCamil Staps8-47/+61
2015-06-10CleanupCamil Staps3-29/+18
2015-06-10Several fixesCamil Staps10-55/+51
2015-06-10Cleanup; about dialogueCamil Staps10-285/+61
2015-06-10javadocCamil Staps10-58/+73
2015-06-10Moving stuff aroundCamil Staps9-129/+129
2015-06-10Cleanup xmlCamil Staps21-153/+64
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps0-0/+0
2015-06-10LicenseCamil Staps42-39/+707
2015-06-10LicenseCamil Staps41-38/+704
2015-06-10Cleanup; licenseCamil Staps7-215/+45
2015-06-10LicenseCamil Staps64-0/+1414
2015-06-10todoCamil Staps1-2/+3
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps1-1/+4
2015-06-10CleanupCamil Staps31-349/+179
2015-06-10Bugs I encountered while working on tutorialzkwip1-1/+4
2015-06-10Fixed bug where fragments were shown over one anotherCamil Staps6-11/+11
2015-06-10Don't repeat error messagesCamil Staps1-3/+24
2015-06-10Less space inbetween cardsCamil Staps2-4/+12
2015-06-10Babluki updatezkwip1-0/+2
balbablbalbalbabl
2015-06-10TodoSize431-0/+1