aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Add Tags on Importkaffeeringe2015-01-181-1/+13
* remove autoload section in composer.jsonNicolas Lœuillet2015-01-161-5/+0
* Merge pull request #1004 from wallabag/packagistNicolas Lœuillet2015-01-161-0/+28
|\
| * Fixed #993: add wallabag to packagistNicolas Lœuillet2015-01-161-0/+28
|/
* Merge pull request #986 from goofy-bz/patch-2Nicolas Lœuillet2015-01-021-1/+1
|\
| * Update fr_FR.utf8.pogoofy-bz2015-01-021-1/+1
|/
* Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_importThomas Citharel2014-12-261-1/+4
|\
| * Make call to FTRSS silent to avoid warnings which can break importJean Baptiste Favre2014-12-211-1/+4
|/
* Merge pull request #933 from wallabag/dev1.8.1old1.8.1bis1.8.1bNicolas Lœuillet2014-11-161-2/+2
|\
| * update constant versionThomas Citharel2014-11-161-2/+2
* | Merge pull request #932 from wallabag/dev1.8.1Nicolas Lœuillet2014-11-15103-501/+2186
|\|
| * add DS_Store in gitignoreNicolas Lœuillet2014-11-081-0/+1
| * Merge pull request #926 from jsit/aboutlinkNicolas Lœuillet2014-11-052-2/+2
| |\
| | * Fixing URL typo on about pageJay Sitter2014-11-052-2/+2
| |/
| * Merge pull request #921 from wallabag/about-pageThomas Citharel2014-11-036-1/+153
| |\
| | * add about pageNicolas Lœuillet2014-11-036-1/+153
| * | Merge pull request #920 from jsit/uifixesNicolas Lœuillet2014-11-038-137/+236
| |\ \
| | * | Applying changes to config.twig to default theme as wellJay Sitter2014-11-031-58/+71
| | * | Removing title text from bookmarkletJay Sitter2014-11-031-1/+1
| | * | Restoring change password section in configJay Sitter2014-11-031-0/+21
| | * | Many small UI changes/fixes to Baggy theme and English translation files. May...Jay Sitter2014-11-027-73/+138
| | * | Removing spaces before colons on config screenJay Sitter2014-11-021-4/+4
| | * | Merge branch 'dev' into uitextcaseJay Sitter2014-11-011-0/+3
| | |\ \
| | * | | Capitalizing "EPUB" as is defined by IDPF: http://idpf.org/epubJay Sitter2014-10-314-10/+10
| * | | | Merge pull request #922 from jsit/menuhidingNicolas Lœuillet2014-11-032-1/+4
| |\ \ \ \
| | * | | | Improving class names for menu hidingJay Sitter2014-11-032-2/+2
| | * | | | Fixing menu hiding behavior when switching from mobile width to desktop widthJay Sitter2014-11-032-1/+4
| |/ / / /
| * | | | Merge pull request #919 from jsit/popupjs_Nicolas Lœuillet2014-11-032-25/+71
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Improving JavaScript for popup formsJay Sitter2014-11-022-25/+71
| |/ / /
| * | | Merge pull request #917 from jsit/menuopacityThomas Citharel2014-10-311-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Changing my tabs to spaces :)Jay Sitter2014-10-311-3/+3
| | * | Fixing opacity issue when using mobile menuJay Sitter2014-10-311-0/+3
| |/ /
| * | Merge pull request #913 from jsit/hotfixThomas Citharel2014-10-311-1/+1
| |\ \
| | * | Fixing regression in popup close button stylingJay Sitter2014-10-311-1/+1
| |/ /
| * | Merge branch 'jsit-duplicateformstyles' into devtcit2014-10-312-3/+3
| |\ \
| | * \ fix merge errorstcit2014-10-312-3/+3
| | |\ \
| | | * \ Merging changes with devJay Sitter2014-10-315-28/+36
| | | |\ \
| * | | | | Merge branch 'jsit-duplicateformstyles' into devtcit2014-10-313-56/+20
| |\| | | | | | |_|/ / | |/| | |
| | * | | mergetcit2014-10-313-56/+20
| |/| | | | | |/ /
| | * | Making visual styling of search and bag it popup forms more consistentJay Sitter2014-10-313-19/+9
| | * | Removing duplicate popup form stylesJay Sitter2014-10-311-42/+16
| * | | Merge pull request #909 from jsit/closebuttonThomas Citharel2014-10-313-22/+26
| |\ \ \
| | * | | Removing left border on popup forms on mobile widthsJay Sitter2014-10-311-0/+1
| | * | | Fixing popup form width issue on narrow widthJay Sitter2014-10-311-1/+8
| | * | | Standardizing class names and styles for close buttonsJay Sitter2014-10-313-21/+17
| | |/ /
| * | | Merge pull request #910 from jsit/default-theme-search-form-cssThomas Citharel2014-10-312-6/+10
| |\ \ \
| | * | | Moving search-form style out of messages css and into style.cssJay Sitter2014-10-312-6/+10
| |/ / /
| * | | Merge pull request #908 from jsit/closemessageThomas Citharel2014-10-311-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Changing close message button to use × instead of XJay Sitter2014-10-311-1/+1
| |/ /
| * | Merge pull request #907 from jsit/loginThomas Citharel2014-10-313-11/+10
| |\ \