aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Display text on baggyJeremy Benoist2016-08-2113-5/+20
| | * Changed code indentationNicolas Lœuillet2016-08-182-6/+14
| | * Added creation date and reading time on article viewNicolas Lœuillet2016-08-1813-0/+32
| * | Merge pull request #2221 from wallabag/replace-favorite-starJeremy Benoist2016-08-2116-22/+22
| |\ \
| | * | Fixed some translationsNicolas Lœuillet2016-08-183-4/+4
| | * | Replaced favorite word/icon with star oneNicolas Lœuillet2016-08-1816-22/+22
| | |/
| * / Avoid breaking import when fetching failJeremy Benoist2016-08-203-32/+63
| |/
| * 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
| * Merge pull request #2199 from Simounet/facto/social-linksJeremy Benoist2016-07-218-52/+95
| |\
| | * 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
* | 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
* | 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
* | 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
| |\
| | * 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
| * | 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
| * Merge pull request #2122 from wallabag/fix-tags-deletionNicolas Lœuillet2016-05-3117-41/+122
| |\
| | * Change ManyToMany between entry & tagJeremy Benoist2016-05-314-7/+68
| | * Display a message when saving an entry failedJeremy Benoist2016-05-3012-27/+45
| | * 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
| * | Merge pull request #2052 from danbartram/feature-filter-unreadJeremy Benoist2016-05-2714-0/+50
| |\ \ | | |/ | |/|
| | * Add unread filter test to EntryControllerTestDaniel Bartram2016-05-091-0/+18
| | * Add unread filter to entries pagesDaniel Bartram2016-05-0913-0/+32
* | | Merge pull request #2142 from wallabag/v2-use-npmNicolas Lœuillet2016-06-23105-19146/+108
|\ \ \