aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Prepare release 2.0.6Nicolas Lœuillet2016-08-106-6/+22
|
* Merge pull request #2200 from charno6/patch-1Thomas Citharel2016-07-231-1/+1
|\ | | | | Fixed typo in entry:notice:entry_saved
| * Fixed typo in entry:notice:entry_savedcharno62016-07-231-1/+1
|/ | | "Eintag" to "Eintrag"
* Merge pull request #2199 from Simounet/facto/social-linksJeremy Benoist2016-07-218-52/+95
|\ | | | | Handling socials links into a config file
| * php-cs-fixer passSimounet2016-07-202-2/+4
| |
| * Chrome extension URL updatedSimounet2016-07-201-1/+1
| |
| * Handling socials links into a config fileSimounet2016-07-208-52/+93
| |
* | Merge pull request #2198 from Simounet/fix/image-inside-figureThomas Citharel2016-07-202-2/+3
|\ \ | |/ |/| FIX image inside a figure element max-width
| * FIX image inside a figure element max-width (baggy theme)Simounet2016-07-201-1/+1
| |
| * FIX image inside a figure element max-widthSimounet2016-07-201-1/+2
|/
* 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 #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
| * Corrected Regex for lighttpd rewriteEven Allmighty2016-06-131-1/+1
|/
* Merge pull request #2118 from wallabag/prepare-205Nicolas Lœuillet2016-05-315-4/+24
|\ | | | | Prepare wallabag 2.0.5
| * Prepare wallabag 2.0.5Nicolas Lœuillet2016-05-315-5/+25
| |
* | Merge pull request #2122 from wallabag/fix-tags-deletionNicolas Lœuillet2016-05-3117-41/+122
|\ \ | | | | | | Fix the deletion of Tags/Entries relation when delete an entry
| * | Change ManyToMany between entry & tagJeremy Benoist2016-05-314-7/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed
| * | Display a message when saving an entry failedJeremy Benoist2016-05-3012-27/+45
| | | | | | | | | | | | | | | When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too.
| * | Move fixtures to the right placeJeremy Benoist2016-05-302-6/+8
| | |
| * | Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-05-281-1/+1
| |/ | | | | | | Fix #2121
* | Merge pull request #2052 from danbartram/feature-filter-unreadJeremy Benoist2016-05-2714-0/+50
|\ \ | | | | | | Add unread filter to entries pages
| * | Add unread filter test to EntryControllerTestDaniel Bartram2016-05-091-0/+18
| | | | | | | | | | | | | | | | | | Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 18:23:43 +0000