aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
Commit message (Collapse)AuthorAgeFilesLines
* added reload functionThomas Citharel2014-12-132-1/+11
|
* added diaspora sharingThomas Citharel2014-12-061-0/+2
|
* failover if theme folder doesn't existNicolas Lœuillet2014-11-241-1/+1
|
* fix merge confictThomas Citharel2014-11-191-1/+1
|\
| * fix FlattrsThomas Citharel2014-11-191-1/+0
| |
* | default deactivatedThomas Citharel2014-11-191-2/+2
| |
* | implementing carrot into wallabagThomas Citharel2014-11-192-2/+2
|/
* Adjusting Template class so that _global is ignored as a themeJay Sitter2014-11-171-2/+2
|
* Merge pull request #921 from wallabag/about-pageThomas Citharel2014-11-032-1/+3
|\ | | | | add about page
| * add about pageNicolas Lœuillet2014-11-032-1/+3
| |
* | Changing close message button to use × instead of XJay Sitter2014-10-311-1/+1
|/
* Adding 'en_US' locale (issue #901)Jay Sitter2014-10-301-1/+2
|
* Merge pull request #889 from wallabag/fix#871Nicolas Lœuillet2014-10-271-1/+1
|\ | | | | Fix#871
| * translation fix finished for #871 and bring add tag from search feature to ↵tcit2014-10-271-1/+1
| | | | | | | | all themes
* | updated site_configNicolas Lœuillet2014-10-2764-119/+685
| |
* | fix #882tcit2014-10-221-1/+1
| |
* | update zeit.de.txt for removal of inline adsMarmo2014-10-211-0/+4
|/
* Merge pull request #848 from 11mariom/devNicolas Lœuillet2014-10-142-0/+3
|\ | | | | Add support for custom http port
| * Add support for custom http portMariusz Kozakowski2014-09-232-0/+3
| | | | | | | | | | Now you can use wallabag behind reverse proxy (i.e Squid or Varnish) without problem with urls like wallabag.example.com:8080.
* | Merge pull request #843 from rros/mysql-utf8mb4Nicolas Lœuillet2014-10-141-3/+5
|\ \ | | | | | | Convert the MySQL charset to utf8mb4 to support the full range of unicode
| * | Convert the MySQL charset to utf8mb4 to support the full range of unicode ↵Robert Ros2014-09-181-3/+5
| |/ | | | | | | characters
* | Create adme.ru.txtThomas Citharel2014-10-121-0/+6
| | | | | | Siteconfig
* | update heise.de.txtMarmo2014-10-111-2/+4
| | | | | | Multi-page Telepolis-articles (www.heise.de/tp/...) are not fetched correctly atm. My addition to the single_page_link makes it work (tested with http://www.heise.de/tp/artikel/42/42579/1.html).
* | Merge pull request #855 from wallabag/fix-828Nicolas Lœuillet2014-10-041-0/+7
|\ \ | | | | | | Fix #828
| * | get full contenttcit2014-10-041-0/+7
| | |
* | | get contenttcit2014-10-041-0/+8
|/ /
* | Merge pull request #853 from wallabag/fix-for-#797Thomas Citharel2014-10-041-0/+7
|\ \ | | | | | | Fix for #797
| * | Fix for #797tcitworld2014-08-051-0/+7
| | |
* | | get up to date for mergetcit2014-09-282-4/+5
|\ \ \
| * | | added email fieldtcit2014-07-253-5/+6
| | | |
* | | | merge refactor and devtcit2014-09-2712-123/+291
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | fix pictures display when DOWNLOAD_PICTURES is enabledThomas Citharel2014-09-161-1/+1
| | |
| * | Implemented additional check for using the 'X-Forwarded-Port' header.André König2014-09-111-0/+4
| | |
| * | Merge pull request #819 from wallabag/fixSQLiteDownloadDBtcitworld2014-09-102-17/+0
| |\ \ | | | | | | | | Fix downloading SQLite database from all users
| | * | remove old functionThomas Citharel2014-08-281-17/+0
| | | |
| | * | Fix downloading SQLite database from all usersThomas Citharel2014-08-262-11/+11
| | | |
| * | | Complete rework of faz.net-template adding multipage support and major ↵zinnober2014-08-232-26/+136
| |/ / | | | | | | | | | article cleanup
| * | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-08-211-0/+4
| |\ \
| | * \ Merge pull request #814 from wallabag/fix-issue813tcitworld2014-08-211-0/+4
| | |\ \ | | | | | | | | | | vendor dir is not accessible before install, sqlite db dir write check moved into db class
| | | * | vendor dir is not accessible before install, sqlite db dir write check moved ↵Maryana Rozhankivska2014-08-211-0/+4
| | | |/ | | | | | | | | | | | | into db class
| * | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-08-212-1/+9
| |\| |
| | * | Merge pull request #783 from wallabag/message-after-loginNicolas Lœuillet2014-08-181-0/+8
| | |\ \ | | | | | | | | | | #763 fix to display the login successful message with the translation
| | | * | fix to display the login successful message with the translationNicolas Lœuillet2014-07-221-0/+8
| | | | |
| | * | | Merge pull request #785 from wallabag/change-default-paginationNicolas Lœuillet2014-08-181-1/+1
| | |\ \ \ | | | |_|/ | | |/| | change default pagination, set it to 12, to have a nice baggy display
| | | * | change default pagination, set it to 12, to have a nice baggy displayNicolas Lœuillet2014-07-221-1/+1
| | | |/
| * | | merge fix 776Thomas Citharel2014-08-161-37/+36
| |\ \ \ | | |/ / | |/| |
| | * | minimum of control on server side addedMaryana Rozhankivska2014-08-151-1/+4
| | |/
| * | typoNicolas Lœuillet2014-07-251-4/+4
| | |
| * | security issueMaryana Rozhankivska2014-07-242-42/+45
| | |
| * | Merge branch 'dev' of github.com:wallabag/wallabag into devNicolas Lœuillet2014-07-231-0/+21
| |\ \