mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-01 03:20:43 +00:00
Code Issues Projects Releases Wiki Activity
2714 commits 14 branches 99 tags 148 MiB
Commit graph

2714 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Lœuillet e49c62fac8 Fix form user display for baggy theme 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet 8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet 2e16a90339 Merge pull request #2216 from Rurik19/master 
Enable CORS headers for OAUTH part
 2016-08-16 14:22:43 +02:00
Rurik19 848c2e1b97 Enable CORS headers for OAUTH part 2016-08-12 13:01:53 +05:00
Nicolas Lœuillet 00acc0d006 Changed URL for scrutinizer in README 2016-08-11 20:57:06 +02:00
Nicolas Lœuillet 8617972f3f Merge pull request #2212 from wallabag/prepare-206 
Prepare release 2.0.6
 2016-08-10 15:03:43 +02:00
Nicolas Lœuillet a26f91dcb6 Prepare release 2.0.6 2016-08-10 14:26:13 +02:00
Jeremy Benoist b10a422e1f Merge pull request #2202 from wallabag/fix-phpdoc 
add some missing phpdoc parameters
 2016-07-24 11:49:21 +02:00
Thomas Citharel 8cb869ea95
add some missing phpdoc parameters 2016-07-24 11:47:03 +02:00
Thomas Citharel 029965b6a2 Merge pull request #2200 from charno6/patch-1 
Fixed typo in entry:notice:entry_saved
 2016-07-23 22:58:26 +02:00
charno6 75ac3e6289 Fixed typo in entry:notice:entry_saved 
"Eintag" to "Eintrag"
 2016-07-23 22:40:23 +02:00
Jeremy Benoist 8c7d7c0300 Merge pull request #2199 from Simounet/facto/social-links 
Handling socials links into a config file
 2016-07-21 16:17:53 +02:00
Simounet 57c608fa94 php-cs-fixer pass 2016-07-20 23:08:04 +02:00
Simounet 40288b7166 Chrome extension URL updated 2016-07-20 22:55:43 +02:00
Thomas Citharel 78d1727096 Merge pull request #2198 from Simounet/fix/image-inside-figure 
FIX image inside a figure element max-width
 2016-07-20 20:44:47 +02:00
Simounet 0e1abf392c FIX image inside a figure element max-width (baggy theme) 2016-07-20 20:23:55 +02:00
Simounet f64472e9f8 FIX image inside a figure element max-width 2016-07-20 19:39:24 +02:00
Simounet 39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +02:00
Jeremy Benoist 0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
Nicolas Lœuillet 317fc6e684 Merge pull request #2195 from wallabag/remove-bin 
Remove binary from repo
 2016-07-20 11:38:55 +02:00
Jeremy Benoist 8d8d48a2bb Remove binary from repo 
Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

⚠️ You have to update your Composer to the 1.2 (`composer selfupdate`)
 2016-07-20 10:51:37 +02:00
Nicolas Lœuillet 0dc09439ef Merge pull request #2048 from wallabag/travis-php-7.1 
Run PHP 7.1 on Travis
 2016-07-19 11:24:26 +02:00
Jeremy Benoist ab3eb4ba95 Merge pull request #2194 from benages/patch-2 
Fixed spelling Artúclos --> Artículos
 2016-07-18 22:56:02 +02:00
benages 57b62cbf79 Fixed spelling Artúclos --> Artículos 2016-07-18 21:53:53 +02:00
Jeremy Benoist 1973897305 Run PHP 7.1 on Travis 
- Using nightly (as of now it's PHP 7.1 alpha)
- Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)
 2016-07-18 18:07:25 +02:00
Jeremy Benoist 2bb138ef6d Merge pull request #2183 from wallabag/tags-entries-view-baggy 
Bring tags on entries view to baggy
 2016-07-18 15:17:33 +02:00
Thomas Citharel 51cbc2ebfe Merge pull request #2185 from wallabag/fix-3rd-party-links 
Fix 3rd-Party Apps links (Chrome & Firefox)
 2016-07-02 12:33:33 +02:00
Thomas Citharel 8d4152f70d
Remove fr part 2016-07-02 11:56:14 +02:00
Thomas Citharel baef8ea26c
Fix 3rd-Party Apps links (Chrome & Firefox) 2016-07-02 11:50:32 +02:00
Thomas Citharel 1d4d9aaf29
Bring tags on entries view to baggy 
Also, a couple of UI improvement and CSS fixing
 2016-07-01 13:59:30 +02:00
Nicolas Lœuillet 9dbd3e9302 Merge pull request #2174 from wallabag/api-filter-tags 
Add filter for tags on API
 2016-07-01 10:35:45 +02:00
Thomas Citharel 4f0558a0d4 fix merge issue 2016-06-29 20:52:37 +02:00
Thomas Citharel 28803f106b Add filter for tags on API 2016-06-29 09:55:57 +02:00
Nicolas Lœuillet a314b920bf Merge pull request #2176 from wallabag/add-since-parameter 
Add since parameter
 2016-06-29 09:34:39 +02:00
Thomas Citharel e43c78abd9 CS 2016-06-25 23:19:21 +02:00
Thomas Citharel e5fb89e5d3 Add since parameter 2016-06-25 21:05:50 +02:00
Nicolas Lœuillet 33e2aec18b Merge pull request #2170 from wallabag/addTagsOnEntriesView 
Add tags on entries view and minor ui fixes
 2016-06-24 14:23:38 +02:00
Nicolas Lœuillet 9f8c43e222 Merge pull request #2172 from wallabag/more-tests 
Change the way to login user in tests
 2016-06-24 14:22:47 +02:00
Thomas Citharel eef833d644 uniformize tags on article view too 2016-06-24 12:07:45 +02:00
Jeremy Benoist fdc90ceb17 Change the way to login user in tests 
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport
 2016-06-24 11:55:47 +02:00
Thomas Citharel e7aed21b33 add line to other languages 2016-06-24 11:45:42 +02:00
Jeremy Benoist 2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +02:00
Jeremy Benoist b1c9b78203 Merge pull request #2169 from wallabag/fix-fonts 
fix font paths
 2016-06-24 09:20:52 +02:00
Thomas Citharel a15022db96 minor ui fixes 2016-06-23 23:13:25 +02:00
Thomas Citharel 91826e3ca2 fix typo on icons 2016-06-23 22:51:09 +02:00
Thomas Citharel 25dc07d3c9 Add tags on entries view 
Should be tested on old browsers
 2016-06-23 22:50:39 +02:00
Thomas Citharel dafc5cf993 fix font paths 2016-06-23 22:10:12 +02:00
Nicolas Lœuillet 20218495a7 Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs 
Add modules when NodeJS versions are too low.
 2016-06-23 15:09:57 +02:00
Thomas Citharel 9ccb96cfe2 Add modules when NodeJS versions are too low. 
And eventually one required anyway.
 2016-06-23 14:34:59 +02:00
Jeremy Benoist f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00