aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-07-2026-64/+149
|\
| * Merge pull request #2195 from wallabag/remove-binNicolas Lœuillet2016-07-2010-9/+6
| |\ | | | | | | Remove binary from repo
| | * Remove binary from repoJeremy Benoist2016-07-2010-9/+6
| |/ | | | | | | | | | | | | 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. :warning: You have to update your Composer to the 1.2 (`composer selfupdate`)
| * Merge pull request #2048 from wallabag/travis-php-7.1Nicolas Lœuillet2016-07-193-2/+3
| |\ | | | | | | Run PHP 7.1 on Travis
| | * Run PHP 7.1 on TravisJeremy Benoist2016-07-183-2/+3
| | | | | | | | | | | | | | | - 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)
| * | Merge pull request #2194 from benages/patch-2Jeremy Benoist2016-07-181-1/+1
| |\ \ | | |/ | |/| Fixed spelling Artúclos --> Artículos
| | * Fixed spelling Artúclos --> Artículosbenages2016-07-181-1/+1
| |/
| * Merge pull request #2185 from wallabag/fix-3rd-party-linksThomas Citharel2016-07-021-2/+2
| |\ | | | | | | Fix 3rd-Party Apps links (Chrome & Firefox)
| | * Remove fr partThomas Citharel2016-07-021-1/+1
| | |
| | * Fix 3rd-Party Apps links (Chrome & Firefox)Thomas Citharel2016-07-021-2/+2
| |/
| * Merge pull request #2172 from wallabag/more-testsNicolas Lœuillet2016-06-2411-51/+138
| |\ | | | | | | Change the way to login user in tests
| | * Change the way to login user in testsJeremy Benoist2016-06-246-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Remove useless spacesJeremy Benoist2016-06-246-42/+48
| |/
* | Merge pull request #2183 from wallabag/tags-entries-view-baggyJeremy Benoist2016-07-184-75/+137
|\ \ | | | | | | Bring tags on entries view to baggy
| * | Bring tags on entries view to baggyThomas Citharel2016-07-014-75/+137
|/ / | | | | | | Also, a couple of UI improvement and CSS fixing
* | Merge pull request #2174 from wallabag/api-filter-tagsNicolas Lœuillet2016-07-013-2/+32
|\ \ | | | | | | Add filter for tags on API
| * | fix merge issueThomas Citharel2016-06-291-1/+2
| | |
| * | Add filter for tags on APIThomas Citharel2016-06-293-2/+31
|/ /
* | Merge pull request #2176 from wallabag/add-since-parameterNicolas Lœuillet2016-06-293-2/+53
|\ \ | | | | | | Add since parameter
| * | CSThomas Citharel2016-06-251-1/+1
| | |
| * | Add since parameterThomas Citharel2016-06-253-2/+53
|/ /
* | Merge pull request #2170 from wallabag/addTagsOnEntriesViewNicolas Lœuillet2016-06-2414-5/+75
|\ \ | | | | | | Add tags on entries view and minor ui fixes
| * | uniformize tags on article view tooThomas Citharel2016-06-241-2/+3
| | |
| * | add line to other languagesThomas Citharel2016-06-249-0/+9
| | |
| * | minor ui fixesThomas Citharel2016-06-232-5/+6
| | |
| * | fix typo on iconsThomas Citharel2016-06-231-2/+2
| | |
| * | Add tags on entries viewThomas Citharel2016-06-234-0/+59
| | | | | | | | | | | | Should be tested on old browsers
* | | Merge pull request #2169 from wallabag/fix-fontsJeremy Benoist2016-06-242-2/+3
|\ \ \ | |/ / |/| | fix font paths
| * | fix font pathsThomas Citharel2016-06-232-2/+3
|/ /
* | Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejsNicolas Lœuillet2016-06-231-1/+3
|\ \ | | | | | | Add modules when NodeJS versions are too low.
| * | Add modules when NodeJS versions are too low.Thomas Citharel2016-06-231-1/+3
|/ / | | | | | | And eventually one required anyway.
* | Merge branch 'master' into 2.1Jeremy Benoist2016-06-2354-102/+133
|\|
| * Merge pull request #2157 from wallabag/lower-upper-readingtimeJeremy Benoist2016-06-232-7/+52
| |\ | | | | | | Handle only upper or only lower reading filter
| | * Add some tests about readingTimeJeremy Benoist2016-06-231-0/+36
| | |
| | * fixup! Handle only upper or only lower reading filterJeremy Benoist2016-06-231-2/+2
| | |
| | * Handle only upper or only lower reading filterJeremy Benoist2016-06-231-7/+16
| | | | | | | | | | | | When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).
| * | Merge pull request #2165 from wallabag/translation-typosJeremy Benoist2016-06-231-4/+4
| |\ \ | | |/ | |/| Fix a few french translations typos
| | * Fix a few french translations typosThomas Citharel2016-06-231-4/+4
| |/
| * Merge pull request #2132 from wallabag/sf3.1Nicolas Lœuillet2016-06-2353-91/+77
| |\ | | | | | | Jump to Symfony 3.1
| | * Fix bad loading fixturesJeremy Benoist2016-06-221-0/+1
| | | | | | | | | | | | | | | Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded. No time for investigate but reverting back to 1.1.* is fixing issues.
| | * Jump to Symfony 3.1Jeremy Benoist2016-06-2253-91/+76
| |/
| * Merge pull request #2160 from wallabag/bin-cs-fixerNicolas Lœuillet2016-06-201-1/+1
| |\ | | | | | | Update symlink to php-cs-fixer
| | * Update symlink to php-cs-fixerJeremy Benoist2016-06-201-1/+1
| |/
| * Merge pull request #2155 from wallabag/php-cs-fixerNicolas Lœuillet2016-06-201-1/+1
| |\ | | | | | | Use friendsofphp instead of fabpot
| | * Use friendsofphp instead of fabpotJeremy Benoist2016-06-171-1/+1
| | | | | | | | | | | | The fabpot's one is now depreacted
| * | Merge pull request #2156 from wallabag/delete-redirectNicolas Lœuillet2016-06-201-3/+4
| |\ \ | | |/ | |/| Try to find bad redirection after delete
| | * Try to find bad redirection after deleteJeremy Benoist2016-06-171-3/+4
| |/ | | | | | | | | Instead of checking for the whole absolute url, we just check with the relative url. If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
| * Merge pull request #2148 from wallabag/start-german-docuJeremy Benoist2016-06-1623-2/+1443
| |\ | | | | | | translate documentation to German
| | * translate documentation to GermanSven Fischer2016-06-1623-2/+1443
| | |
| * | Merge pull request #2145 from even-allmighty/masterJeremy Benoist2016-06-131-1/+1
| |\| | | | | | | Corrected Regex for lighttpd rewrite
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 18:58:14 +0000