aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Collapse)AuthorFilesLines
2015-05-21Merge branch 'master' of https://github.com/camilstaps/RSSinSize436-29/+27
2015-05-21Fixed Serializable attributes & cleaned up code.Size4311-177/+129
2015-05-21New iconHalzyn5-0/+0
2015-05-21Needs TestingHalzyn1-29/+27
doe het wel een keer als mn internet werkt want FUCK EDUROAM
2015-05-21Add feedsCamil Staps4-11/+56
2015-05-21Merge branch 'app'Camil Staps3-10/+25
2015-05-21Delete filtersCamil Staps3-10/+25
2015-05-21Merge branch 'app'Camil Staps6-11/+130
2015-05-21Rotation fixes & moreCamil Staps6-11/+130
2015-05-21This wasn't committed for some reason.Size431-1/+2
2015-05-21Merge branch 'master' of https://github.com/camilstaps/RSSinSize4312-40/+198
2015-05-21Reduced LOC + FeedSorter sorts by category, author, title and date/time + ↵Size435-39/+105
reduced learning rate from 0.3 to 0.2
2015-05-21Fix saving filters; remove keywordsCamil Staps4-19/+19
2015-05-21Remove keywords by long clickCamil Staps1-1/+17
2015-05-21Edit filter title; add keywordsCamil Staps8-27/+160
2015-05-21Nicer text sizes; dimensions in dimens.xmlCamil Staps4-6/+15
2015-05-20summary shitzkwip10-50/+1787
geeft wel maar een regel
2015-05-20start smmry, pak waarschijnlijk iets anders anywayzkwip1-2/+2
2015-05-20JavaDocCamil Staps8-44/+102
2015-05-20Merge branch 'app'Camil Staps8-92/+120
2015-05-20FilterSettingsActivity exampleCamil Staps8-92/+120
2015-05-20JavaDocHalzyn1-4/+19
Speciaal voor de haters
2015-05-20FeedLoaderAndSorter addedSize436-48/+82
2015-05-20fix voor josHalzyn1-27/+30
de poepkaas is real
2015-05-20RSS channel feed tags addedHalzyn3-80/+349
what the title says hahahhhahagsdjfasjhgkjher not funny
2015-05-20Merge remote-tracking branch 'origin/app'Size4316-55/+368
2015-05-20FilterSettingsActivityCamil Staps11-22/+306
2015-05-20Saving FeedSorter + train() method to train neural network on previously ↵Size4310-64/+174
saved feedback
2015-05-20merge fixCamil Staps1-4/+0
2015-05-19Merge branch 'master' into appCamil Staps9-46/+148
2015-05-19FilterSettingsActivityCamil Staps7-7/+61
2015-05-19NN JUnit tests + fixSize4319-73/+593
2015-05-19FeedLoader fixesHalzyn2-5/+19
stuff
2015-05-19wip summaryzkwip4-1/+81
2015-05-19Added filters in option menu; removed option menu from filteractivityCamil Staps5-34/+9
2015-05-19Merge branch 'master' into appCamil Staps3-18/+249
Conflicts: app/src/main/java/org/rssin/rss/Feed.java
2015-05-19FiltersCamil Staps10-21/+232
2015-05-19Merge branch 'master' of https://github.com/camilstaps/RSSinSize432-0/+8
2015-05-19Simple toString methodHalzyn2-0/+8
more commit spam lel
2015-05-19Merge branch 'master' of https://github.com/camilstaps/RSSinSize431-15/+18
2015-05-19RSS package categories part 2Halzyn1-15/+18
oops
2015-05-19Merge branch 'master' of https://github.com/camilstaps/RSSinSize432-7/+7
2015-05-19RSS package categoriesHalzyn2-7/+7
Categories are now represented in lists of strings
2015-05-19Merge branch 'master' of https://github.com/camilstaps/RSSinSize433-19/+242
2015-05-19Merge branch 'master' of https://github.com/camilstaps/RSSinSize432-0/+63
2015-05-19Updated RSS packageHalzyn3-19/+242
Implemented XML parsing, general fixes.
2015-05-19Fixed FeedSorter.Size437-60/+141
2015-05-19Merge branch 'master' into appCamil Staps12-0/+506
2015-05-19basic Filter & Keyword classesCamil Staps2-0/+63
2015-05-19Framework FiltersActivityCamil Staps5-0/+68