garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity
1,432 Commits 3 Branches 75 Tags
ea00ce37052b867e6edd513fb147b50dfd3358c5
Commit Graph

1432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LpSamuelm
ea00ce3705 Translated new labels to Swedish 2013-07-10 15:22:36 +02:00
Athou
be4b15be70 admin cleanup interface 2013-07-10 15:15:31 +02:00
Athou
c7d316e17b cleanup 2013-07-10 12:22:22 +02:00
Jeremie Panzer
f930581319 multithread 2013-07-10 12:20:12 +02:00
Jeremie Panzer
a42222858f Merge remote-tracking branch 'openshift/master' 
Conflicts:
	.openshift/markers/java7
	src/main/java/.gitkeep
	src/main/resources/.gitkeep
 2013-07-10 12:07:13 +02:00
Template builder
e5f9c9d617 Creating template 2013-07-10 06:01:18 -04:00
Athou
430cc9b039 use settings instead of hardcoded value 2013-07-10 11:01:24 +02:00
Athou
dd05bcbcde wait for threads to finish before starting new ones 2013-07-10 10:56:42 +02:00
Athou
d293926624 parrallel delete 2013-07-10 10:36:53 +02:00
Athou
fafc66eb8e add warning for heavy load usage 2013-07-10 09:57:01 +02:00
Athou
3871af9c7f use user setting if not under heavy load (#78) 2013-07-10 09:25:59 +02:00
Athou
30e608ffe5 more keyboard shortcuts 2013-07-10 09:24:07 +02:00
Athou
7504f1024f Merge pull request #413 from ekovi/patch-3 
Grammar fix
 2013-07-10 00:10:27 -07:00
ekovi
52dea8b9d0 Grammar fix 2013-07-10 08:48:05 +02:00
Athou
d1d41f6449 Merge branch 'patch-1' of https://github.com/ekovi/commafeed into ekovi-patch-1 
Conflicts:
	src/main/resources/i18n/cs.properties
 2013-07-10 06:15:43 +02:00
Athou
f23a44a07e Merge pull request #411 from MageFroh/null-ptr-fix 
Fix null ptr exception in feed/get/{id} rest call when all entries are read
 2013-07-09 21:12:58 -07:00
Athou
5a27d65eb5 Merge pull request #410 from LpSamuelm/patch-14 
Switched to OPML in translations
 2013-07-09 21:11:59 -07:00
ekovi
82ecf4e4fd Updated translation 2013-07-10 00:16:54 +02:00
MageFroh
7ace9c46da fix null ptr exception in feed/get/{id} rest call when all entries are read 
- map of the unread counts does not contain any element for the feed if
  no entry is unread, leading to a null pointer exception when building
  the response
- problem occurs for example when showing the feed details and all entries
  are read: all fields are blank
 2013-07-09 23:02:41 +01:00
LpSamuelm
0160c4aee2 Switched to OPML in translations 2013-07-09 23:49:40 +02:00
Athou
b2d0d8da26 return unread count 2013-07-09 22:16:00 +02:00
Athou
4fb22a39a6 list cloudfeedlr 2013-07-09 22:04:22 +02:00
Athou
f3721db108 Merge pull request #408 from ebraminio/master 
Some improvements to bidi and favicon
 2013-07-09 12:58:15 -07:00
Ebrahim Byagowi
0eda8a26b9 keep direction of p tag 
* spotted on http://fedorafans.com
 2013-07-09 20:38:13 +04:30
Ebrahim Byagowi
fad48a9bb1 tweak favicon (thanks to bersam) 2013-07-09 20:37:12 +04:30
Ebrahim Byagowi
1057623c32 tweak fa translation 2013-07-09 20:36:27 +04:30
Athou
71fb2a4ffc import cleanup 2013-07-09 15:27:46 +02:00
Athou
36ff091067 Merge pull request #407 from ekovi/master 
fixed help page
 2013-07-09 05:27:00 -07:00
ekovi
8a93d5bb9b fixed help page 
before http://tinypic.com/r/68wyo3/5
fixed http://tinypic.com/r/2n7398z/5

sorry for lang - gotta hurry
 2013-07-09 13:48:01 +02:00
ekovi
ac9a9c07e6 fixed help page 2013-07-09 13:41:16 +02:00
Athou
308eaf8b8d google reader is no more :( 2013-07-09 12:57:48 +02:00
Athou
544eb2ee10 fix keyboard navigation for the tree (fix #404) 2013-07-09 12:44:13 +02:00
Athou
d78679d3d8 smaller batch size 2013-07-09 09:10:30 +02:00
Athou
d2a99bb694 Merge pull request #405 from ekovi/patch-1 
Updated
 2013-07-08 23:55:52 -07:00
ekovi
e29cb52e28 Updated 2013-07-09 08:54:50 +02:00
Athou
a7a0949436 resolve feeds from database 2013-07-09 08:18:16 +02:00
Athou
32fb22d503 automatic merging of duplicate feeds 2013-07-09 08:06:32 +02:00
Athou
2e51bb066d fix build 2013-07-08 22:28:37 +02:00
Athou
d6237c56c6 merge interface tweaks 2013-07-08 22:20:32 +02:00
Athou
132c1b0aaf minimum count as parameter 2013-07-08 20:38:06 +02:00
Athou
bd047efcd2 actually add the feeds to the list 2013-07-08 19:01:08 +02:00
Athou
b6b4395b91 Merge pull request #403 from LpSamuelm/patch-13 
Translated new labels to Swedish
 2013-07-08 08:42:19 -07:00
Athou
d33c93b21e remove extra comma 2013-07-08 17:08:46 +02:00
LpSamuelm
3002f9c553 Translated new labels to Swedish 2013-07-08 17:07:14 +02:00
Athou
52270d50d9 interface for deleting duplicates 2013-07-08 16:38:09 +02:00
Athou
c8ff6e1d20 allow keyboard shortcuts when keep unread checkbox is focused (fix #198) 2013-07-08 12:12:35 +02:00
Athou
e357810b22 Merge pull request #402 from ebraminio/master 
Remove whitespace inside link + fa translating
 2013-07-08 02:41:18 -07:00
Ebrahim Byagowi
44d16eb875 Remove whitespace inside link + fa translating 2013-07-08 13:53:30 +04:30
Athou
809f77a787 new label 2013-07-08 09:38:15 +02:00
Athou
4d8f0865ba display link to feed source (fix #355) 2013-07-08 09:37:34 +02:00