aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Implement Twig_Extension_GlobalsInterface to remove deprecationNicolas Lœuillet2016-08-231-1/+1
|
* Display entries number for each categoryNicolas Lœuillet2016-08-232-4/+37
|
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-2231-133/+284
|\
| * Merge pull request #2222 from wallabag/add-date-on-article-viewNicolas Lœuillet2016-08-2213-0/+55
| |\ | | | | | | Added creation date and reading time on article view
| | * Display text on baggyJeremy Benoist2016-08-2113-5/+20
| | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date
| | * Changed code indentationNicolas Lœuillet2016-08-182-6/+14
| | |
| | * Added creation date and reading time on article viewNicolas Lœuillet2016-08-1813-0/+32
| | | | | | | | | | | | Fix #2034
| * | Merge pull request #2221 from wallabag/replace-favorite-starJeremy Benoist2016-08-2116-22/+22
| |\ \ | | | | | | | | Replaced favorite word/icon with star one
| | * | Fixed some translationsNicolas Lœuillet2016-08-183-4/+4
| | | |
| | * | Replaced favorite word/icon with star oneNicolas Lœuillet2016-08-1816-22/+22
| | |/ | | | | | | | | | Fix #2041
| * / Avoid breaking import when fetching failJeremy Benoist2016-08-203-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.
| * CSJeremy Benoist2016-08-173-5/+7
| |
| * Fix form user display for baggy themeNicolas Lœuillet2016-08-171-1/+2
| |
| * Fix form user display when 2FA is disabledNicolas Lœuillet2016-08-171-1/+1
| |
| * 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
| | |
| * | 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
| |/
* | Added name on clientThomas Citharel2016-08-2211-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 parametersThomas Citharel2016-07-241-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-07-202-3/+3
|\|
| * Fixed spelling Artúclos --> Artículosbenages2016-07-181-1/+1
| |
| * Remove fr partThomas Citharel2016-07-021-1/+1
| |
| * Fix 3rd-Party Apps links (Chrome & Firefox)Thomas Citharel2016-07-021-2/+2
| |
* | Bring tags on entries view to baggyThomas Citharel2016-07-012-1/+11
| | | | | | | | Also, a couple of UI improvement and CSS fixing
* | fix merge issueThomas Citharel2016-06-291-1/+2
| |
* | Add filter for tags on APIThomas Citharel2016-06-292-2/+9
| |
* | CSThomas Citharel2016-06-251-1/+1
| |
* | Add since parameterThomas Citharel2016-06-252-2/+8
| |
* | add line to other languagesThomas Citharel2016-06-249-0/+9
| |
* | minor ui fixesThomas Citharel2016-06-231-5/+2
| |
* | fix typo on iconsThomas Citharel2016-06-231-2/+2
| |
* | Add tags on entries viewThomas Citharel2016-06-233-0/+21
| | | | | | | | Should be tested on old browsers
* | Merge branch 'master' into 2.1Jeremy Benoist2016-06-2346-6063/+20
|\|
| * Merge pull request #2157 from wallabag/lower-upper-readingtimeJeremy Benoist2016-06-231-7/+16
| |\ | | | | | | Handle only upper or only lower reading filter
| | * 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).
| * | Fix a few french translations typosThomas Citharel2016-06-231-4/+4
| |/
| * Jump to Symfony 3.1Jeremy Benoist2016-06-2245-6058/+0
| |
| * 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 #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.