aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #2252 from wallabag/fix-last-mergeNicolas Lœuillet2016-09-021-1/+1
|\ \ \ | | | | | | | | Fixed last merge who caused CSS/JS bugs
| * | | Fixed last merge who caused CSS/JS bugsNicolas Lœuillet2016-08-301-1/+1
| | | |
* | | | Merge pull request #2242 from wallabag/fix-minor-cssJeremy Benoist2016-09-012-2/+17
|\ \ \ \ | |/ / / |/| | | Fix print / article views
| * | | CSS indentationNicolas Lœuillet2016-09-011-2/+2
| | | |
| * | | Fixed print view for baggy themeNicolas Lœuillet2016-08-261-1/+3
| | | |
| * | | Fix print / article viewsNicolas Lœuillet2016-08-261-1/+14
| | | |
* | | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-281-0/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Add icon for public share linkNicolas Lœuillet2016-08-251-0/+4
| | |
* | | Merge pull request #1904 from wallabag/feature-public-modeJeremy Benoist2016-08-2513-4/+93
|\ \ \ | | | | | | | | Share entry with a public URL
| * | | Handle share_entryJeremy Benoist2016-08-2411-0/+27
| | | | | | | | | | | | | | | | | | | | - share_entry needs to be in the migration too - and it needs a translation
| * | | Handle table prefix in migrationJeremy Benoist2016-08-242-7/+29
| | | | | | | | | | | | | | | | and fix migration for name field in oauth table
| * | | Change share entry behaviorNicolas Lœuillet2016-08-231-12/+0
| | | |
| * | | Improve migrationNicolas Lœuillet2016-08-231-9/+7
| | | |
| * | | Add test and fix migrationNicolas Lœuillet2016-08-231-4/+31
| | | |
| * | | Add migrationNicolas Lœuillet2016-08-231-0/+26
| | | |
| * | | Share entry with a public URLNicolas Lœuillet2016-08-231-0/+1
| | |/ | |/|
* | | Proper parameter name, simplify logic & phpdocThomas Citharel2016-08-231-1/+1
| | |
* | | Add option to disable registrationThomas Citharel2016-08-232-0/+4
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-223-4/+9
|\|
| * Prepare wallabag 2.0.7Nicolas Lœuillet2016-08-221-1/+1
| |
| * Merge pull request #2220 from Rurik19/masterJeremy Benoist2016-08-181-1/+1
| |\ | | | | | | Enable PATCH method for CORS in API part
| | * Enable PATCH method for CORS in API partRurik192016-08-181-1/+1
| | |
| * | Merge pull request #2216 from Rurik19/masterNicolas Lœuillet2016-08-161-0/+5
| |\| | | | | | | Enable CORS headers for OAUTH part
| | * Enable CORS headers for OAUTH partRurik192016-08-121-0/+5
| | |
| * | Prepare release 2.0.6Nicolas Lœuillet2016-08-101-1/+1
| | |
* | | Added name on clientThomas Citharel2016-08-221-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.1Jeremy Benoist2016-07-206-42/+48
|\| |
| * | Change the way to login user in testsJeremy Benoist2016-06-241-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 spacesJeremy Benoist2016-06-246-42/+48
| | |
* | | Bring tags on entries view to baggyThomas Citharel2016-07-012-74/+126
| | | | | | | | | | | | Also, a couple of UI improvement and CSS fixing
* | | uniformize tags on article view tooThomas Citharel2016-06-241-2/+3
| | |
* | | minor ui fixesThomas Citharel2016-06-231-0/+4
| | |
* | | Add tags on entries viewThomas Citharel2016-06-231-0/+38
| | | | | | | | | | | | Should be tested on old browsers
* | | Merge branch 'master' into 2.1Jeremy Benoist2016-06-233-9/+9
|\| |
| * | Jump to Symfony 3.1Jeremy Benoist2016-06-223-9/+9
| | |
| * | Prepare wallabag 2.0.5Nicolas Lœuillet2016-05-311-1/+1
| |/
* | clean & lint stuffThomas Citharel2016-06-098-323/+322
| |
* | manage assets through npmThomas Citharel2016-06-0946-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.ymlDaniele Conca2016-05-111-7/+7
|
* Prepare wallabag 2.0.4Nicolas Lœuillet2016-05-071-1/+1
|
* Merge pull request #2018 from jamiroconca/patch-2Nicolas Lœuillet2016-05-031-0/+1
|\ | | | | Update config.yml, add italian as available language
| * Update config.ymlDaniele Conca2016-05-031-0/+1
| | | | | | add italian as available language
* | Create CraueConfigBundle.it.ymlDaniele Conca2016-05-031-0/+29
|/ | | baseline italian translations
* Update CraueConfigBundle.es.ymljami72016-04-271-3/+3
|
* Prepare release 2.0.3Nicolas Lœuillet2016-04-221-1/+1
|
* Merge pull request #1948 from wallabag/prepare-2022.0.2Nicolas Lœuillet2016-04-211-1/+1
|\ | | | | Prepare release 2.0.2
| * Prepare release 2.0.2Nicolas Lœuillet2016-04-191-1/+1
| |
* | Update links in documentationNicolas Lœuillet2016-04-191-1/+1
|/
* Merge pull request #1916 from wallabag/cleanupNicolas Lœuillet2016-04-139-119/+33
|\ | | | | Convert array + phpDoc
| * Move test parameters out of parameters.ymlJeremy Benoist2016-04-129-119/+33
| | | | | | | | The end user doesn't care to about the test database.