aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
AgeCommit message (Collapse)AuthorFilesLines
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps8-9/+21
Conflicts: app/src/main/java/org/rssin/rssin/Feed.java
2015-06-10Merge branch 'master' of http://github.com/camilstaps/RSSinSize437-9/+8
2015-06-10uniqueKey() will not return the same key twiceSize432-1/+13
2015-06-10Removed todos if not needed anymorezkwip7-9/+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 resolvedSize438-40/+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 Staps7-43/+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 Staps8-127/+128
2015-06-10Cleanup xmlCamil Staps21-153/+64
2015-06-10LicenseCamil Staps41-38/+704
2015-06-10LicenseCamil Staps63-0/+1134
2015-06-10CleanupCamil Staps31-349/+179
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-10Merge branch 'master' of https://github.com/camilstaps/RSSinHalzyn4-4/+4
2015-06-10MergeHalzyn61-1822/+491
2015-06-10Fix everythingSize434-4/+4
2015-06-10RANDOM COMMIT BECAUSE GIT SUCKSHalzyn1-1/+0
2015-06-10Merge branch 'master' of http://github.com/camilstaps/RSSinSize4318-212/+171
2015-06-10Feed titles from RSS feedsSize434-16/+73
2015-06-10Tutorial doneHalzyn32-11/+72
2015-06-10Merge branch 'master' of github:camilstaps/RSSinCamil Staps49-1595/+248
Conflicts: app/src/main/java/org/rssin/android/FeedSorterTrainer.java app/src/main/java/org/rssin/neurons/FeedSorter.java app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java app/src/main/java/org/rssin/neurons/NeuralNetwork.java app/src/main/java/org/rssin/rssin/SortedFeedItemContainer.java
2015-06-10IT WORKSCamil Staps18-211/+171
2015-06-10Aligned (EDIT) to the rightSize433-12/+33
2015-06-10Added icons, changed filter title edittext to singleline, fixed feed ↵Size4325-20/+14
settings crash
2015-06-10Fixed all hardcoded stringsSize437-10/+15
2015-06-10Merge branch 'master' of http://github.com/camilstaps/RSSinSize4313-1506/+18
2015-06-10Added comments to rssin.neurons.*Size4310-10/+149
2015-06-10cleared up summary packagezkwip7-1486/+7
2015-06-10Removed hardcoded strings & only one TrainingCase is stored per Article.Size436-61/+35
2015-06-10Fix ConcurrentModificationException; cleaner drawer layoutCamil Staps6-20/+11
2015-06-09Summary shortening improvementszkwip1-11/+45
made the length limiter less greedy