Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Store cache lifetime in config | Nicolas Lœuillet | 2016-09-03 | 4 | -2/+15 |
| | |||||
* | Enable cache for queries | Nicolas Lœuillet | 2016-09-01 | 2 | -8/+36 |
| | |||||
* | Implement Twig_Extension_GlobalsInterface to remove deprecation | Nicolas Lœuillet | 2016-08-23 | 1 | -1/+1 |
| | |||||
* | Display entries number for each category | Nicolas Lœuillet | 2016-08-23 | 2 | -4/+37 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-22 | 31 | -133/+284 |
|\ | |||||
| * | Merge pull request #2222 from wallabag/add-date-on-article-view | Nicolas Lœuillet | 2016-08-22 | 13 | -0/+55 |
| |\ | | | | | | | Added creation date and reading time on article view | ||||
| | * | Display text on baggy | Jeremy Benoist | 2016-08-21 | 13 | -5/+20 |
| | | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date | ||||
| | * | Changed code indentation | Nicolas Lœuillet | 2016-08-18 | 2 | -6/+14 |
| | | | |||||
| | * | Added creation date and reading time on article view | Nicolas Lœuillet | 2016-08-18 | 13 | -0/+32 |
| | | | | | | | | | | | | Fix #2034 | ||||
| * | | Merge pull request #2221 from wallabag/replace-favorite-star | Jeremy Benoist | 2016-08-21 | 16 | -22/+22 |
| |\ \ | | | | | | | | | Replaced favorite word/icon with star one | ||||
| | * | | Fixed some translations | Nicolas Lœuillet | 2016-08-18 | 3 | -4/+4 |
| | | | | |||||
| | * | | Replaced favorite word/icon with star one | Nicolas Lœuillet | 2016-08-18 | 16 | -22/+22 |
| | |/ | | | | | | | | | | Fix #2041 | ||||
| * / | Avoid breaking import when fetching fail | Jeremy Benoist | 2016-08-20 | 3 | -32/+63 |
| |/ | | | | | | | | | | | | | | | | | graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf). Import doesn't handle that case and break the whole import. With that commit the import isn't stopped but the entry is just skipped. Also, as a bonus, I've added extra test on WallabagImportV2 when the json is empty. | ||||
| * | CS | Jeremy Benoist | 2016-08-17 | 3 | -5/+7 |
| | | |||||
| * | Fix form user display for baggy theme | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+2 |
| | | |||||
| * | Fix form user display when 2FA is disabled | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed typo in entry:notice:entry_saved | charno6 | 2016-07-23 | 1 | -1/+1 |
| | | | | | | "Eintag" to "Eintrag" | ||||
| * | Merge pull request #2199 from Simounet/facto/social-links | Jeremy Benoist | 2016-07-21 | 8 | -52/+95 |
| |\ | | | | | | | Handling socials links into a config file | ||||
| | * | php-cs-fixer pass | Simounet | 2016-07-20 | 2 | -2/+4 |
| | | | |||||
| | * | Chrome extension URL updated | Simounet | 2016-07-20 | 1 | -1/+1 |
| | | | |||||
| | * | Handling socials links into a config file | Simounet | 2016-07-20 | 8 | -52/+93 |
| | | | |||||
| * | | FIX image inside a figure element max-width (baggy theme) | Simounet | 2016-07-20 | 1 | -1/+1 |
| | | | |||||
| * | | FIX image inside a figure element max-width | Simounet | 2016-07-20 | 1 | -1/+2 |
| |/ | |||||
* | | Added name on client | Thomas Citharel | 2016-08-22 | 11 | -23/+75 |
| | | | | | | | | | | | | | | | | - Fix typos in field name - Added migration for name field in API client table Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2171 | ||||
* | | add some missing phpdoc parameters | Thomas Citharel | 2016-07-24 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-07-20 | 2 | -3/+3 |
|\| | |||||
| * | Fixed spelling Artúclos --> Artículos | benages | 2016-07-18 | 1 | -1/+1 |
| | | |||||
| * | Remove fr part | Thomas Citharel | 2016-07-02 | 1 | -1/+1 |
| | | |||||
| * | Fix 3rd-Party Apps links (Chrome & Firefox) | Thomas Citharel | 2016-07-02 | 1 | -2/+2 |
| | | |||||
* | | Bring tags on entries view to baggy | Thomas Citharel | 2016-07-01 | 2 | -1/+11 |
| | | | | | | | | Also, a couple of UI improvement and CSS fixing | ||||
* | | fix merge issue | Thomas Citharel | 2016-06-29 | 1 | -1/+2 |
| | | |||||
* | | Add filter for tags on API | Thomas Citharel | 2016-06-29 | 2 | -2/+9 |
| | | |||||
* | | CS | Thomas Citharel | 2016-06-25 | 1 | -1/+1 |
| | | |||||
* | | Add since parameter | Thomas Citharel | 2016-06-25 | 2 | -2/+8 |
| | | |||||
* | | add line to other languages | Thomas Citharel | 2016-06-24 | 9 | -0/+9 |
| | | |||||
* | | minor ui fixes | Thomas Citharel | 2016-06-23 | 1 | -5/+2 |
| | | |||||
* | | fix typo on icons | Thomas Citharel | 2016-06-23 | 1 | -2/+2 |
| | | |||||
* | | Add tags on entries view | Thomas Citharel | 2016-06-23 | 3 | -0/+21 |
| | | | | | | | | Should be tested on old browsers | ||||
* | | Merge branch 'master' into 2.1 | Jeremy Benoist | 2016-06-23 | 46 | -6063/+20 |
|\| | |||||
| * | Merge pull request #2157 from wallabag/lower-upper-readingtime | Jeremy Benoist | 2016-06-23 | 1 | -7/+16 |
| |\ | | | | | | | Handle only upper or only lower reading filter | ||||
| | * | fixup! Handle only upper or only lower reading filter | Jeremy Benoist | 2016-06-23 | 1 | -2/+2 |
| | | | |||||
| | * | Handle only upper or only lower reading filter | Jeremy Benoist | 2016-06-23 | 1 | -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). | ||||
| * | | Fix a few french translations typos | Thomas Citharel | 2016-06-23 | 1 | -4/+4 |
| |/ | |||||
| * | Jump to Symfony 3.1 | Jeremy Benoist | 2016-06-22 | 45 | -6058/+0 |
| | | |||||
| * | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-17 | 1 | -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 #2122 from wallabag/fix-tags-deletion | Nicolas Lœuillet | 2016-05-31 | 17 | -41/+122 |
| |\ | | | | | | | Fix the deletion of Tags/Entries relation when delete an entry | ||||
| | * | Change ManyToMany between entry & tag | Jeremy Benoist | 2016-05-31 | 4 | -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 failed | Jeremy Benoist | 2016-05-30 | 12 | -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 place | Jeremy Benoist | 2016-05-30 | 2 | -6/+8 |
| | | | |||||
| | * | Fix the deletion of Tags/Entries relation when delete an entry | Nicolas Lœuillet | 2016-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Fix #2121 |