aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 2.1Jeremy Benoist2016-06-2354-102/+133
|\
| * 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.
| | * | 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-23135-17886/+2755
|\ \ \ \ | | | | | | | | | | Manage assets through npm
| * | | | trailing commaThomas Citharel2016-06-091-1/+1
| | | | |
| * | | | remove block added twiceThomas Citharel2016-06-091-85/+0
| | | | |
| * | | | clean & lint stuffThomas Citharel2016-06-0911-390/+391
| | | | |
| * | | | manage assets through npmThomas Citharel2016-06-09160-17580/+2743
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Update symlink to php-cs-fixerJeremy Benoist2016-06-231-1/+1
| | | | |
* | | | | 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.
* | | | | Use friendsofphp instead of fabpotJeremy Benoist2016-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | The fabpot's one is now depreacted
* | | | | translate documentation to GermanSven Fischer2016-06-2323-2/+1443
| | | | |
* | | | | Corrected Regex for lighttpd rewriteEven Allmighty2016-06-231-1/+1
| | | | |
* | | | | Prepare wallabag 2.0.5Nicolas Lœuillet2016-06-235-4/+24
| | | | |
* | | | | 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-273-8/+6
| | | | |
* | | | | Add CLI import for wallabag v2 filesNicolas Lœuillet2016-05-273-33/+52
| |/ / / |/| | |
* | | | Merge pull request #2112 from Poorchop/docs-proposalNicolas Lœuillet2016-05-262-19/+78
|\ \ \ \ | | | | | | | | | | Docs proposal
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:09:42 +0000