Commit graph

533 commits

Author SHA1 Message Date
Thomas Citharel
a754e1c3f0 Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanosuke-dev 2015-06-29 15:29:18 +02:00
Thomas Citharel
a85171062a new config file
Taken from https://github.com/ebal/confs/blob/master/wallabag/inc/3rdparty/site_config/standard/n0where.net.txt
2015-06-17 23:24:45 +02:00
Thomas Citharel
21353e4448 Merge branch 'dev' of http://github.com/wallabag/wallabag into dev 2015-06-13 10:34:34 +02:00
Thomas Citharel
c57e38595e bring back long lasting session...maybe 2015-06-11 22:58:01 +02:00
Thomas Citharel
98da2bc527 Fix #1215 2015-06-11 22:26:13 +02:00
Carsten Ringe
6e22fc17d2 Use config option BASE_URL in getPocheUrl() 2015-06-09 19:51:01 +02:00
Vincent Malley
63fc40ff84 [1005] fixing redirection when deleting archived article 2015-06-02 15:29:44 -04:00
Vincent Malley
900f2a9160 Merge remote-tracking branch 'upstream/dev' into dev 2015-06-02 11:09:37 -04:00
Vincent Malley
f9c8087f78 [1203] fixing tag export 2015-06-02 11:09:28 -04:00
Thomas Citharel
ddbb2308a3 check that URL are real ones before importing them (for instance, avoid bookmarklets) 2015-05-30 18:11:00 +02:00
Thomas Citharel
3a690fad55 declare function correctly 2015-05-25 20:44:22 +02:00
Thomas Citharel
f0a819a968 added commentsand fixed something forgotten 2015-05-22 20:09:23 +02:00
Thomas Citharel
d31766300a added Firefox-bookmarks format import mode 2015-05-22 19:29:12 +02:00
Nicolas Lœuillet
2c83940270 fix restart of import 2015-05-19 21:11:19 +02:00
Thomas Citharel
7f8f8271e4 redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring 2015-03-14 00:22:11 +01:00
Thomas Citharel
f5618feb73 fix #1154 2015-03-13 23:33:49 +01:00
Thomas Citharel
ae27d0ffca fix little problems and bring previous features to all themes 2015-03-13 17:08:14 +01:00
Thomas Citharel
f76dab12c9 fix for #1153, a couple of improvements and fixed bugs 2015-03-13 16:49:20 +01:00
Thomas Citharel
ab87a7fe69 tag cloud is present, #1122 is implemented 2015-03-08 14:47:22 +01:00
Thomas Citharel
512ff18015 implement #1122 2015-03-08 02:36:37 +01:00
Thomas Citharel
5e10eee8fc Merge branch 'dev' of github.com:wallabag/wallabag into dev 2015-03-08 00:23:10 +01:00
Thomas Citharel
8a66458ba2 mark read and go to next now in the right direction 2015-03-08 00:22:47 +01:00
Thomas Citharel
3b21caa261 remove unnecessary lines (again) 2015-03-07 13:48:40 +01:00
Thomas Citharel
00483a1e0e remove unnecessary line 2015-03-07 13:44:47 +01:00
Thomas Citharel
e9540cad02 autoclose was not declared 2015-03-07 13:39:16 +01:00
Thomas Citharel
059a338034 implement #1123 2015-03-02 00:15:49 +01:00
Thomas Citharel
6269df8df9 fix pdf being saved at root, now in cache/ folder 2015-03-01 20:36:10 +01:00
Thomas Citharel
9e5dc91c03 Merge branch 'dev' of github.com:wallabag/wallabag into dev 2015-02-19 01:39:47 +01:00
Thomas Citharel
8cebef88ec fix for #1102, eventually #1041 2015-02-19 01:39:31 +01:00
Thomas Citharel
056a3c6cdc remove old code 2015-02-19 01:21:30 +01:00
Thomas Citharel
df89c6f71a Change message type from success to error
See #1096
2015-02-18 19:16:42 +01:00
Thomas Citharel
336797f309 adapt for php < 5.4
Still not obsolete. :(
2015-02-16 16:57:16 +01:00
Thomas Citharel
cdee5e6570 much better fix for #1082 2015-02-16 15:18:24 +01:00
Thomas Citharel
6b60741600 alternative random function to fix #1082 2015-02-16 00:43:18 +01:00
Thomas Citharel
d523c99399 Delete en_EN language (GB and US are available) 2015-02-15 21:17:50 +01:00
Thomas Citharel
c35753dd3e support GB english 2015-02-14 16:23:39 +01:00
Thomas Citharel
50b752c21e set registration to false 2015-02-14 15:12:56 +01:00
Thomas Citharel
054c9d8838 (definitely) fixed utf8mb4 and check if user already exists in database before installing first user 2015-02-14 15:12:02 +01:00
Thomas Citharel
952faeeb31 forgot this file 2015-02-14 12:36:00 +01:00
Thomas Citharel
698eda739e mainly css improvements 2015-02-14 12:35:22 +01:00
Thomas Citharel
f2321633b9 couple improvements, translations 2015-02-13 19:39:48 +01:00
Thomas Citharel
0eae6d14b8 Merge branch 'dev' into register 2015-02-13 19:15:31 +01:00
Thomas Citharel
dc6ec98758 just a reminder 2015-02-13 19:14:56 +01:00
Thomas Citharel
6cb5e1c9f5 improvements to internal registration and translations 2015-02-13 19:10:22 +01:00
Thomas Citharel
57068585c0 Merge branch 'dev' into sendmailatregistration 2015-02-13 17:14:08 +01:00
Thomas Citharel
28c42eb1d8 Merge pull request #1053 from erixtekila/dev
Fix fetched entries when localized
2015-02-10 01:23:30 +01:00
Nicolas Lœuillet
b65d65be31 Merge pull request #1067 from vpmalley/dev
added site config for github gists, jungle-world.com and toolinux.com
2015-02-09 11:41:18 +01:00
Vincent Malley
3250b6a7a7 fixing display of jungle-world article (issue # 1034) 2015-02-08 18:46:49 -05:00
Vincent Malley
c76211de3f adding site config for toolinux.com 2015-02-08 17:21:29 -05:00
Vincent Malley
7f31a3ed24 fixing gist parsing 2015-02-08 15:58:24 -05:00