aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * Add unread filter to entries pagesDaniel Bartram2016-05-0913-0/+32
| | | | | | | | | | | | Add the ability to filter for unread pages in the filters menu.
* | | Merge pull request #2142 from wallabag/v2-use-npmNicolas Lœuillet2016-06-23105-19146/+108
|\ \ \ | | | | | | | | Manage assets through npm
| * | | remove block added twiceThomas Citharel2016-06-091-85/+0
| | | |
| * | | manage assets through npmThomas Citharel2016-06-09123-19197/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest 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. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed 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. Change ManyToMany between entry & tag 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 Prepare wallabag 2.0.5 enforce older materialize version
* | | | Try to find bad redirection after deleteJeremy Benoist2016-06-231-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.
* | | | Change ManyToMany between entry & tagJeremy Benoist2016-06-234-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-06-2312-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-06-232-6/+8
| | | |
* | | | Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-06-231-1/+1
| | | | | | | | | | | | | | | | Fix #2121
* | | | Add unread filter test to EntryControllerTestDaniel Bartram2016-06-231-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.
* | | | Add unread filter to entries pagesDaniel Bartram2016-06-2313-0/+32
| | | | | | | | | | | | | | | | Add the ability to filter for unread pages in the filters menu.
* | | | Enhance option in commandNicolas Lœuillet2016-05-271-4/+2
| | | |
* | | | Add CLI import for wallabag v2 filesNicolas Lœuillet2016-05-271-1/+12
| |/ / |/| |
* | | Improve English translationPoorchop2016-05-231-11/+11
|/ /
* | Merge pull request #2097 from bmillemathias/issue_2045Nicolas Lœuillet2016-05-191-1/+1
|\ \ | | | | | | Fix image path in 2-factor authentification email
| * | Forgot a double quoteBaptiste Mille-Mathias2016-05-191-1/+1
| | |
| * | Fix image path in 2-factor authentification emailBaptiste Mille-Mathias2016-05-181-1/+1
| | | | | | | | | | | | Fix the broken url to image ressource hosted on wallabag.org
* | | CSJeremy Benoist2016-05-191-4/+3
| | |
* | | Merge pull request #2092 from Rurik19/issue2089Jeremy Benoist2016-05-192-4/+92
|\ \ \ | |/ / |/| | Starred and Archived clears if article is already exists
| * | Tests for issue #2089Yuriy Evdokimov2016-05-181-0/+88
| | |
| * | PATCH also clears starred and archived signsYuriy Evdokimov2016-05-181-2/+2
| | |
| * | Starred and Archived clears if article is already existsYuriy Evdokimov2016-05-181-2/+2
| | |
* | | Replace vertical dots in material theme with horizontal dotsNicolas Lœuillet2016-05-181-1/+1
|/ /
* / Do not specify language in Firefox addon linkMerouane Atig2016-05-131-1/+1
|/
* Fix translation for validatorsNicolas Lœuillet2016-05-0722-77/+66
| | | | Fix #2003
* Merge pull request #2020 from wallabag/fix-number-entries-per-tagJeremy Benoist2016-05-073-2/+14
|\ | | | | Fix number of entries in tag/list
| * Rename getEntriesByUser method to getEntriesByUserIdNicolas Lœuillet2016-05-043-3/+3
| |
| * Fix number of entries in tag/listNicolas Lœuillet2016-05-033-2/+14
| | | | | | | | Fix #2006
* | Update messages.it.ymlDaniele Conca2016-05-051-62/+62
| | | | | | other translations added
* | Update messages.it.ymlDaniele Conca2016-05-041-131/+131
| |
* | Add pagination bar at the bottom of the pageNicolas Lœuillet2016-05-034-21/+25
| | | | | | | | Fix #2021
* | Fix pagination bar on small devicesNicolas Lœuillet2016-05-031-0/+3
|/ | | | Fix #2008
* Create messages.it.ymlDaniele Conca2016-05-031-0/+425
| | | baseline for italian translations (cloned from english)
* Merge pull request #2013 from wallabag/fix-display-all-tagsJeremy Benoist2016-05-034-36/+6
|\ | | | | Fix tags listing
| * Remove useless methodNicolas Lœuillet2016-05-031-15/+3
| |
| * Fix tags listingNicolas Lœuillet2016-05-024-21/+3
| | | | | | | | | | Fix #1994 * Remove unused method in tag repository
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 12:45:41 +0000