mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-18 07:08:28 +00:00
Code Issues Projects Releases Wiki Activity
3197 commits 11 branches 100 tags 169 MiB
Commit graph

3197 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicolas Lœuillet
1ba542ce04 Prepare wallabag 2.1.6 🚀 2017-01-17 13:59:39 +01:00
Nicolas Lœuillet
9123cb3053 Merge pull request #2758 from wallabag/fix-public-sharing 
Fixed possible JS injection via the title edition
 2017-01-17 11:59:14 +01:00
Nicolas Lœuillet
3d9950792c
Fixed possible JS injection via the title edition 2017-01-17 10:09:04 +01:00
Thomas Citharel
96e2827605 Merge pull request #2736 from lex111/patch-1 
Update copyright year
 2017-01-04 22:43:58 +01:00
Alexey Py
de84b135e2 Update copyright year in COPYING.md 2017-01-05 00:06:09 +03:00
Alexey Py
c20d9e311f Update copyright year 2017-01-04 23:57:33 +03:00
Jeremy Benoist
625bb56181 Merge pull request #2624 from Rurik19/master 
Fix #2056 update config.yml
 2016-11-21 13:14:31 +01:00
Nicolas Lœuillet
83fed2648b Merge pull request #2625 from wallabag/prepare-215 
Prepare wallabag 2.1.5
 2016-11-21 09:49:34 +01:00
Nicolas Lœuillet
98253436e9
Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
Jeremy Benoist
e839f87a1c Merge pull request #2623 from wallabag/composer-php-5.5 
Force composer to run as PHP 5.5.9
 2016-11-21 09:01:35 +01:00
Jeremy Benoist
f32ff37534
Lock down PHPUnit for PHP 5.5 
Since Composer defined lowest version is now PHP 5.5.9.
PHPUnit 5.0 require PHP 5.6.
 2016-11-21 07:46:46 +01:00
Yuriy Evdokimov
05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
Yuriy Evdokimov
5e7fdfc8dd Fix #2056 update config.yml 
Resolves refresh token lifetime issue
 2016-11-21 11:13:40 +05:00
Jeremy Benoist
c396a50509
Force composer to run as PHP 5.5.9 2016-11-20 23:07:38 +01:00
Jeremy Benoist
cb1a6590c0 Merge pull request #2608 from wallabag/change-dev-version 
Change version to 2.2.0-dev
 2016-11-19 14:56:47 +01:00
Nicolas Lœuillet
8fdadee3a5
Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
Nicolas Lœuillet
00b1dc0eb0 Merge pull request #2607 from wallabag/update-changelog 
Updated changelog for 2.1.4
 2016-11-19 14:03:18 +01:00
Nicolas Lœuillet
442dcb8ec1
Updated changelog for 2.1.4 2016-11-19 14:02:32 +01:00
Nicolas Lœuillet
4c27f14fa9 Merge pull request #2604 from wallabag/postgresql-version 
wallabag can’t work on PostgreSQL <= 9.1
 2016-11-19 12:00:18 +01:00
Nicolas Lœuillet
eabcd880ca Merge pull request #2605 from wallabag/update-release-process 
Add .travis.yml change to RELEASE_PROCESS
 2016-11-19 11:57:26 +01:00
Jeremy Benoist
45277ad2bd
Add .travis.yml change to RELEASE_PROCESS 2016-11-19 11:43:47 +01:00
Jeremy Benoist
a2261fbd70 Merge pull request #2603 from wallabag/fix-composer-no-dev 
Fix clear-cache problem using —no-dev
 2016-11-19 11:33:35 +01:00
Jeremy Benoist
cffcce0c92
Wallabag can’t work on PostgreSQL <= 9.1 2016-11-19 11:32:56 +01:00
Jeremy Benoist
01a47da128
Fix clear-cache problem using —no-dev 
Related to :

> PHP Fatal error:  Class 'FOS\RestBundle\Serializer\JMSSerializerAdapter' not found in /Users/j0k/Sites/github/wallabag/var/cache/prod/appProdProjectContainer.php on line 9139
 2016-11-19 10:45:21 +01:00
Nicolas Lœuillet
8853914ba4 Merge pull request #2596 from wallabag/prepare-214 
Prepare wallabag 2.1.4 🚀
 2016-11-18 10:24:55 +01:00
Nicolas Lœuillet
5d2971cadd
Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
Nicolas Lœuillet
19d401b15c Merge pull request #2550 from wallabag/reorder-documentation 
Reordered documentation
 2016-11-18 09:28:20 +01:00
Julian Oster
50540682ff Undo translation of 'in english'. 2016-11-18 09:08:16 +01:00
Julian Oster
2bc5b74c73 Reordered documentation for German. 2016-11-17 19:22:21 +01:00
Julian Oster
887303889b Update translation of link to german translation. 2016-11-17 19:22:19 +01:00
Nicolas Lœuillet
bb624c0269 Reordered 🇫🇷 documentation 2016-11-17 19:22:16 +01:00
Nicolas Lœuillet
2e389b0b90 Reordered documentation 2016-11-17 19:22:15 +01:00
Nicolas Lœuillet
9e0a49e6ac Merge pull request #2578 from wallabag/questionmark-icon 
Added help on config screen
 2016-11-17 09:53:14 +01:00
Nicolas Lœuillet
c894d76e57 Added tooltips for baggy theme 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet
540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Jeremy Benoist
d213219ec7 Merge pull request #2570 from wallabag/add-creation-date 
Added creation date on entries view
 2016-11-15 09:23:44 +01:00
Jeremy Benoist
decf651bbd Merge pull request #2587 from wallabag/user-agents 
User-agents have moved to site-config
 2016-11-15 09:23:26 +01:00
Jeremy Benoist
66fe2a3dc4 User-agents have moved to site-config 
Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way
 2016-11-14 14:29:13 +01:00
Nicolas Lœuillet
a8c6f29f3e
Hide creation date in mobile view 2016-11-14 14:28:42 +01:00
Jeremy Benoist
64d080586d Merge pull request #2584 from blankoworld/master 
fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony
 2016-11-14 14:00:24 +01:00
Nicolas Lœuillet
80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet
1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Olivier DOSSMANN
ccad5d7629 fix #2582 - Nginx config: disable all other PHP file from symphony 
Regarding
https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we
need to limit access to config.php and make_dev.php files from Nginx.
That's why we return 404 error page for these files.
 2016-11-14 11:58:26 +01:00
Jeremy Benoist
d3511bbde9 Merge pull request #2577 from wallabag/add-tooltip-material 
Added tooltips in header bar
 2016-11-14 10:08:26 +01:00
Thomas Citharel
d37081e50b Merge pull request #2562 from wallabag/image-bigger 
Bigger image preview in case of only image content
 2016-11-14 10:01:12 +01:00
Nicolas Lœuillet
cf9ee2fbd0
Added tooltips in header bar 2016-11-12 11:57:55 +01:00
Nicolas Lœuillet
8315507384 Merge pull request #2571 from wallabag/change-language-without-logout 
Changed behavior when we change language
 2016-11-11 18:27:04 +01:00
Nicolas Lœuillet
ece4718f63
Changed behavior when we change language 
No need to disconnect to apply the language substitution
 2016-11-10 20:54:20 +01:00
Nicolas Lœuillet
5cf9604004 Merge pull request #2565 from wallabag/remove-support-website 
Removed support website on about page
 2016-11-09 14:24:32 +01:00
Nicolas Lœuillet
1781ca3763
Removed support website on about page 2016-11-09 13:59:55 +01:00