Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added tags counter in sidebar (material theme) | Nicolas Lœuillet | 2016-09-04 | 1 | -0/+2 |
| | |||||
* | Merge pull request #2002 from wallabag/feature-display-itemsNumber | Jeremy Benoist | 2016-09-03 | 4 | -0/+16 |
|\ | | | | | Feature display items number | ||||
| * | Store cache lifetime in config | Nicolas Lœuillet | 2016-09-03 | 2 | -0/+9 |
| | | |||||
| * | Display entries number for each category | Nicolas Lœuillet | 2016-08-23 | 2 | -0/+7 |
| | | |||||
* | | Fixed different font-size for labels in config screen | Nicolas Lœuillet | 2016-09-02 | 1 | -0/+4 |
| | | | | | | | | Fix #1788 | ||||
* | | Merge pull request #2252 from wallabag/fix-last-merge | Nicolas Lœuillet | 2016-09-02 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed last merge who caused CSS/JS bugs | ||||
| * | | Fixed last merge who caused CSS/JS bugs | Nicolas Lœuillet | 2016-08-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2242 from wallabag/fix-minor-css | Jeremy Benoist | 2016-09-01 | 2 | -2/+17 |
|\ \ \ | |/ / |/| | | Fix print / article views | ||||
| * | | CSS indentation | Nicolas Lœuillet | 2016-09-01 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed print view for baggy theme | Nicolas Lœuillet | 2016-08-26 | 1 | -1/+3 |
| | | | |||||
| * | | Fix print / article views | Nicolas Lœuillet | 2016-08-26 | 1 | -1/+14 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-28 | 1 | -0/+11 |
|\ \ \ | |/ / |/| | | |||||
* | | | Add icon for public share link | Nicolas Lœuillet | 2016-08-25 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #1904 from wallabag/feature-public-mode | Jeremy Benoist | 2016-08-25 | 13 | -4/+93 |
|\ \ \ | | | | | | | | | Share entry with a public URL | ||||
| * | | | Handle share_entry | Jeremy Benoist | 2016-08-24 | 11 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | - share_entry needs to be in the migration too - and it needs a translation | ||||
| * | | | Handle table prefix in migration | Jeremy Benoist | 2016-08-24 | 2 | -7/+29 |
| | | | | | | | | | | | | | | | | and fix migration for name field in oauth table | ||||
| * | | | Change share entry behavior | Nicolas Lœuillet | 2016-08-23 | 1 | -12/+0 |
| | | | | |||||
| * | | | Improve migration | Nicolas Lœuillet | 2016-08-23 | 1 | -9/+7 |
| | | | | |||||
| * | | | Add test and fix migration | Nicolas Lœuillet | 2016-08-23 | 1 | -4/+31 |
| | | | | |||||
| * | | | Add migration | Nicolas Lœuillet | 2016-08-23 | 1 | -0/+26 |
| | | | | |||||
| * | | | Share entry with a public URL | Nicolas Lœuillet | 2016-08-23 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Proper parameter name, simplify logic & phpdoc | Thomas Citharel | 2016-08-23 | 1 | -1/+1 |
| | | | |||||
* | | | Add option to disable registration | Thomas Citharel | 2016-08-23 | 2 | -0/+4 |
|/ / | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-22 | 3 | -4/+9 |
|\| | |||||
| * | Prepare wallabag 2.0.7 | Nicolas Lœuillet | 2016-08-22 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2220 from Rurik19/master | Jeremy Benoist | 2016-08-18 | 1 | -1/+1 |
| |\ | | | | | | | Enable PATCH method for CORS in API part | ||||
| | * | Enable PATCH method for CORS in API part | Rurik19 | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2216 from Rurik19/master | Nicolas Lœuillet | 2016-08-16 | 1 | -0/+5 |
| |\| | | | | | | | Enable CORS headers for OAUTH part | ||||
| | * | Enable CORS headers for OAUTH part | Rurik19 | 2016-08-12 | 1 | -0/+5 |
| | | | |||||
| * | | Prepare release 2.0.6 | Nicolas Lœuillet | 2016-08-10 | 1 | -1/+1 |
| | | | |||||
* | | | Added name on client | Thomas Citharel | 2016-08-22 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
* | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-07-20 | 6 | -42/+48 |
|\| | | |||||
| * | | Change the way to login user in tests | Jeremy Benoist | 2016-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a HTTP request we just login user like FOSUser does. It allows us to mock service in container for functional tests. Also, fix a bad config name in fos_user for firewall And finally, add functional test to PocketImport | ||||
| * | | Remove useless spaces | Jeremy Benoist | 2016-06-24 | 6 | -42/+48 |
| | | | |||||
* | | | Bring tags on entries view to baggy | Thomas Citharel | 2016-07-01 | 2 | -74/+126 |
| | | | | | | | | | | | | Also, a couple of UI improvement and CSS fixing | ||||
* | | | uniformize tags on article view too | Thomas Citharel | 2016-06-24 | 1 | -2/+3 |
| | | | |||||
* | | | minor ui fixes | Thomas Citharel | 2016-06-23 | 1 | -0/+4 |
| | | | |||||
* | | | Add tags on entries view | Thomas Citharel | 2016-06-23 | 1 | -0/+38 |
| | | | | | | | | | | | | Should be tested on old browsers | ||||
* | | | Merge branch 'master' into 2.1 | Jeremy Benoist | 2016-06-23 | 3 | -9/+9 |
|\| | | |||||
| * | | Jump to Symfony 3.1 | Jeremy Benoist | 2016-06-22 | 3 | -9/+9 |
| | | | |||||
| * | | Prepare wallabag 2.0.5 | Nicolas Lœuillet | 2016-05-31 | 1 | -1/+1 |
| |/ | |||||
* | | clean & lint stuff | Thomas Citharel | 2016-06-09 | 8 | -323/+322 |
| | | |||||
* | | manage assets through npm | Thomas Citharel | 2016-06-09 | 46 | -18/+3516 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 CraueConfigBundle.it.yml | Daniele Conca | 2016-05-11 | 1 | -7/+7 |
| | |||||
* | Prepare wallabag 2.0.4 | Nicolas Lœuillet | 2016-05-07 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2018 from jamiroconca/patch-2 | Nicolas Lœuillet | 2016-05-03 | 1 | -0/+1 |
|\ | | | | | Update config.yml, add italian as available language | ||||
| * | Update config.yml | Daniele Conca | 2016-05-03 | 1 | -0/+1 |
| | | | | | | add italian as available language | ||||
* | | Create CraueConfigBundle.it.yml | Daniele Conca | 2016-05-03 | 1 | -0/+29 |
|/ | | | baseline italian translations | ||||
* | Update CraueConfigBundle.es.yml | jami7 | 2016-04-27 | 1 | -3/+3 |
| | |||||
* | Prepare release 2.0.3 | Nicolas Lœuillet | 2016-04-22 | 1 | -1/+1 |
| |