3249 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeremy Benoist	9e2440fe15	Fix migration	2016-11-17 08:05:15 +01:00
Jeremy Benoist	e6b133c60c	CS	2016-11-16 23:10:01 +01:00
Jeremy Benoist	00bf45b6f2	Update unit test for Redirect	2016-11-16 23:07:34 +01:00
Nicolas Lœuillet	54fd55fda1	Tried to fix tests	2016-11-16 23:07:34 +01:00
Nicolas Lœuillet	65cd8a4a9a	Added tests	2016-11-16 23:07:34 +01:00
Nicolas Lœuillet	f052f1fd57	Added constants for redirection values	2016-11-16 23:07:34 +01:00
Strubbl	287204cda7	Update messages.en.yml	2016-11-16 23:07:34 +01:00
Strubbl	f0ba37fbd5	Update messages.de.yml	2016-11-16 23:07:34 +01:00
Strubbl	5d52cc411b	update German configuration.rst	2016-11-16 23:07:34 +01:00
Nicolas Lœuillet	a42f38d9fb	Added a configuration to define the redirection after archiving an entry ... Fix #496	2016-11-16 23:07:34 +01:00
Nicolas Lœuillet	e042a5d78f	Merge pull request #2495 from wallabag/add-shortcuts ... Added shortcuts	2016-11-16 09:35:59 +01:00
Nicolas Lœuillet	94f2057ffe	Added CSS class on links	2016-11-16 09:17:12 +01:00
Thomas Citharel	10a1ffae53	Fix keyboard navigation on quickstart view ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-15 22:23:50 +01:00
Thomas Citharel	c930992348	fix next/prev page	2016-11-15 21:55:16 +01:00
Thomas Citharel	5637a26e9a	Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page ! ... Also better indentation for js files (changed editorconfig for them). Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-15 21:55:10 +01:00
Nicolas Lœuillet	16ef7607f4	Reorganized JS folders for shortcuts	2016-11-15 21:54:50 +01:00
Thomas Citharel	af61cb80eb	es6 imports ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-15 21:54:41 +01:00
Nicolas Lœuillet	f9cded7dd2	Added new shortcuts	2016-11-15 21:54:34 +01:00
Nicolas Lœuillet	49c5d0ad6e	Changed FOSJSRouting format in config	2016-11-15 21:54:20 +01:00
Nicolas Lœuillet	3cc78f0679	Added shortcuts	2016-11-15 21:54:20 +01:00
Nicolas Lœuillet	644b340178	Merge pull request #2566 from wallabag/add-unmarkit ... Added unmark.it sharing	2016-11-09 18:19:08 +01:00
Nicolas Lœuillet	8a9604aafe	Added unmark.it sharing ... Fix #668	2016-11-09 18:18:49 +01:00
Nicolas Lœuillet	1e8c7fa5f9	Merge pull request #2564 from wallabag/mruminski-patch-1 ... Update messages.pl.yml	2016-11-09 09:02:33 +01:00
Mateusz Rumiński	a9740448cf	Update messages.pl.yml ... translate Pinboard importer section to polish	2016-11-08 23:11:03 +01:00
Nicolas Lœuillet	89e167a45a	Merge pull request #2553 from wallabag/add-tagform-mobile ... Added new tag form in mobile view for Material theme	2016-11-08 15:42:05 +01:00
Nicolas Lœuillet	df30af69d2	Added new tag form in mobile view for Material theme ... Fix #2376	2016-11-08 14:24:00 +01:00
Jeremy Benoist	41c2178685	Merge pull request #2548 from wallabag/pinboard ... Add Pinboard import	2016-11-08 14:19:40 +01:00
Strubbl	82f9a52078	docs: update german import.rst	2016-11-07 21:00:57 +01:00
Jeremy Benoist	94060509b8	Use more explicit check	2016-11-07 08:36:52 +01:00
Jeremy Benoist	2e4efb5965	Add english doc into german one	2016-11-06 23:27:55 +01:00
Strubbl	56e6216485	Update messages.en.yml ... Instapaper->Pinboard	2016-11-06 22:29:49 +01:00
Strubbl	e8e72daaa6	Update messages.de.yml	2016-11-06 22:29:08 +01:00
Jeremy Benoist	01ad4d6a89	Merge pull request #2551 from wallabag/remove-maintenance-bundle ... Removed Maintenance bundle	2016-11-06 21:47:16 +01:00
Jeremy Benoist	31151d70f2	Add doc	2016-11-06 21:23:38 +01:00
Nicolas Lœuillet	db3838545c	Removed Maintenance bundle	2016-11-06 15:34:08 +01:00
Jeremy Benoist	e92fbdc852	Fix tests	2016-11-06 09:58:07 +01:00
Jeremy Benoist	9ab024b4f5	Add Pinboard import	2016-11-04 22:44:31 +01:00
Jeremy Benoist	b5571b52cc	Merge pull request #2541 from wallabag/mruminski-patch-1 ... Update messages.pl.yml	2016-11-04 21:49:42 +01:00
Thomas Citharel	cbdbd9d683	Merge pull request #2540 from wallabag/Quent-in-patch-1 ... Update of the OC version	2016-11-04 19:29:27 +01:00
Mateusz Rumiński	ff7f551f5a	Update messages.pl.yml ... missing polish translation added	2016-11-04 19:26:06 +01:00
Quent-in	eaa0bf00a6	Update of the OC version	2016-11-04 18:13:11 +01:00
Jeremy Benoist	4775fed6a7	Merge pull request #2535 from wallabag/default-sort-2.2 ... Use created_at as default sort	2016-11-04 09:38:03 +01:00
Jeremy Benoist	7e9c1d65b1	Add index into Table definition	2016-11-04 08:02:02 +01:00
Jeremy Benoist	1e7b04d4ea	Use created_at as default sort ... With index (following https://github.com/wallabag/wallabag/pull/2534)	2016-11-04 07:56:04 +01:00
Jeremy Benoist	001cc7168a	Cleanup	2016-11-03 18:01:25 +01:00
Jeremy Benoist	864c1dd23a	Fix rest controller merge	2016-11-03 17:29:16 +01:00
Jeremy Benoist	5a619812ca	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-03 16:41:29 +01:00
Jeremy Benoist	da41365579	Merge pull request #2180 from wallabag/download-pictures ... Download pictures	2016-11-03 16:22:07 +01:00
Jeremy Benoist	ca08d02f2f	Add warning message for import + download images ... When import isn't async and downloading images is enabled, we warn the user that import can fail. Also, added missing translations	2016-11-03 15:59:20 +01:00
Nicolas Lœuillet	816c0940d1	Merge pull request #2523 from wallabag/qrcode-android-app ... Added QRCode and link to configure android application	2016-11-03 14:55:24 +01:00