1
0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-17 22:55:15 -05:00
Commit Graph

876 Commits

Author SHA1 Message Date
Nicolas Lœuillet
fddf4fbacc Merge branch 'dev' of git://github.com/arnaudmm/wallabag into arnaudmm-dev 2014-02-20 13:15:27 +01:00
arnaudmm
926acd7bba Feature #457 : import from pocket now import tags too 2014-02-20 13:09:27 +01:00
Nicolas Lœuillet
8975653d4c Merge branch 'mariroz-dev' into dev 2014-02-20 13:03:59 +01:00
Nicolas Lœuillet
689de3dbcc rename font folder into fonts in baggy theme 2014-02-20 13:02:13 +01:00
Nicolas Lœuillet
ab5bb94b12 Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev 2014-02-20 12:49:49 +01:00
Maryana Rozhankivska
6203ef8e51 Merge remote-tracking branch 'upstream/dev' into dev 2014-02-20 11:42:18 +02:00
Maryana Rozhankivska
e83cf5a787 multiple tag entry displayed fix, issue #474 2014-02-20 10:41:16 +02:00
Nicolas Lœuillet
d09a5674e9 [add] message in install screen to prevent user when wallabag is already installed 2014-02-20 08:58:59 +01:00
Nicolas Lœuillet
d0a599bbae Merge pull request #473 from nsteinmetz/dev
Baggy Theme - PtSans font is now local
2014-02-20 08:27:54 +01:00
Nicolas Steinmetz
30c12d3927 add font file 2014-02-19 23:30:55 +01:00
Nicolas Steinmetz
860473f33c Update font.css
Add reference for ptsans font in local instead of google fonts
2014-02-19 23:09:12 +01:00
Nicolas Steinmetz
e1cfef7bf1 Update _head.twig
Remove googlefonts now called in font.css - need still to put the woff file in font directory
2014-02-19 23:08:01 +01:00
Maryana Rozhankivska
b4fd2154fe Full-Text RSS included as a script instead of file_get_contents call. Tnx to @Faless. Fix issues #366 and #463 2014-02-19 19:08:19 +02:00
Nicolas Lœuillet
f37891fdb6 [fix] css display with baggy theme 2014-02-19 15:20:13 +01:00
Nicolas Lœuillet
aad8fbab09 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-19 15:19:02 +01:00
Nicolas Lœuillet
7785f0c75f Merge pull request #467 from mariroz/dev
"save a link" added to top menu (default theme) to toggle "save link" form,  issue #461
2014-02-19 15:17:13 +01:00
Nicolas Lœuillet
a71dc5d7d0 Merge branch 'dev' of git://github.com/mariroz/wallabag into dev 2014-02-19 15:12:49 +01:00
Nicolas Lœuillet
655214ab30 Merge pull request #469 from wallabag/dev
version number 1.5.1
2014-02-19 13:56:06 +01:00
Nicolas Lœuillet
fb5a9666ed version number 1.5.1 2014-02-19 13:55:40 +01:00
Nicolas Lœuillet
60ca369cd3 Merge pull request #468 from wallabag/dev
1.5.1
2014-02-19 13:47:11 +01:00
Nicolas Lœuillet
b89d5a2bf4 [fix] security problems with tags 2014-02-19 13:25:28 +01:00
Nicolas Lœuillet
53ae58e1a1 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-18 21:22:41 +01:00
Nicolas Lœuillet
792097fb6a [add] script to make the install more user friendly #466 2014-02-18 21:22:34 +01:00
Nicolas Lœuillet
970cfb1166 Merge pull request #460 from mariroz/dev
duplicate check added. fix of issue #400
2014-02-18 15:29:40 +01:00
Maryana Rozhankivska
01cd443441 "save a link" added to top menu (default theme) to toggle "save link" form message, issue #461. "Mark all the entries as read" link added in default theme. 2014-02-16 21:00:30 +02:00
Maryana Rozhankivska
488fc63b67 duplicate check added. fix of issue #400 2014-02-14 17:27:22 +02:00
Nicolas Lœuillet
6285e57c49 [add] link to empty cache in config screen, #454 2014-02-14 15:11:57 +01:00
Nicolas Lœuillet
243e13ab59 [fix] #452 remove crappy code 2014-02-13 23:00:26 +01:00
Nicolas Lœuillet
5e98c2183a Merge pull request #450 from wallabag/dev
1.5.0
2014-02-13 19:49:25 +01:00
Nicolas Lœuillet
9f3148fec7 [change] change default content #445 2014-02-13 19:31:46 +01:00
Nicolas Lœuillet
c9357429fd [fix] remove htacces in inc/, bug to fetch content 2014-02-13 19:22:54 +01:00
Nicolas Lœuillet
41265e07d4 add help about vendor.zip 2014-02-13 18:57:57 +01:00
Nicolas Lœuillet
2e4440c3f8 [change] wallabag in feeds title 2014-02-13 08:57:44 +01:00
Nicolas Lœuillet
3141347214 new default theme, baggy \o/ 2014-02-12 21:59:02 +01:00
Nicolas Lœuillet
943ac3c77e new theme, baggy one cf #448 2014-02-12 21:58:40 +01:00
Nicolas Lœuillet
83b47311ba go go go, 1.5 powa 2014-02-12 21:58:14 +01:00
Nicolas Lœuillet
16fd1cce61 [change] time for session 2014-02-12 21:52:51 +01:00
Nicolas Lœuillet
f14807de06 [add] mark all as read #385 2014-02-12 21:52:01 +01:00
Nicolas Lœuillet
ed2853564e [fix] somes fixes on old default theme 2014-02-12 21:51:11 +01:00
Nicolas Lœuillet
26170f4613 change static files 2014-02-12 21:46:49 +01:00
Nicolas Lœuillet
68268c0199 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-12 20:05:51 +01:00
Nicolas Lœuillet
5966d2c2d3 change README 2014-02-12 20:05:47 +01:00
Nicolas Lœuillet
26929c08d3 bug fix #430 - welcome to your wallabag 2014-02-12 20:04:47 +01:00
Nicolas Lœuillet
044bf638a8 bug fix #364 - RSS Feed URL problem with + sign 2014-02-12 19:58:49 +01:00
Nicolas Lœuillet
58f6269f36 Merge pull request #439 from flolauck/master
Adding .htaccess files to prohibit access to critical directories, e.g., db/
2014-02-10 12:10:08 +01:00
Florian Lauck
3a68883ae9 Adding .htaccess files to prohibit access to critical directories, e.g., db/ 2014-02-10 08:58:21 +01:00
Nicolas Lœuillet
211ed48361 Merge pull request #435 from mariroz/dev
Polish and Ukrainian translations added. Russian - updated. Plust 2 smal...
2014-02-07 18:41:30 +01:00
Maryana Rozhankivska
c515ffec9c Polish and Ukrainian translations added. Russian - updated. Plust 2 small translation related fixes in code. 2014-02-07 17:49:27 +02:00
Nicolas Lœuillet
4e09039d2c Merge pull request #434 from thomaslebeau/theme-courgette
Theme courgette
2014-02-07 09:41:42 +01:00
Thomas LEBEAU
1e1e4e4eca [remove] fontello theme courgette 2014-02-07 00:08:58 +01:00