Marien Fressinaud 5f974c2567 Merge branch '163-export' into dev ...

Conflicts:
	app/layout/aside_feed.phtml

2014-03-30 19:17:27 +02:00

..

configure

Merge remote-tracking branch 'origin/dev' into 163-export

2014-03-22 13:22:55 +01:00

entry

Changements de vues

2014-01-18 16:41:10 +01:00

error

Improve login page

2014-02-15 12:25:06 +01:00

feed

Add a bookmark to easily subscribe to websites

2014-03-30 17:52:42 +02:00

helpers

Improve OPML rendering

2014-03-30 14:44:36 +02:00

importExport

Fix typo + improve detection OPML file

2014-03-29 19:10:18 +01:00

index

Revert "Give username/password by GET"

2014-03-02 12:16:20 +01:00

javascript

Use complete instead of done during feed refresh

2014-02-13 21:15:50 +01:00