aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #939 from jsit/globaljsNicolas Lœuillet2014-11-2417-18/+18
|\
| * Updating Baggy theme's head.twig to locate _global js/cssJay Sitter2014-11-181-4/+4
| * _global-izing some more js & cssJay Sitter2014-11-1816-14/+14
* | Merge pull request #942 from wallabag/carrotThomas Citharel2014-11-2111-33/+63
|\ \
| * \ Merge pull request #945 from jsit/carrotThomas Citharel2014-11-211-2/+2
| |\ \
| | * | Fixing icon text on unread pageJay Sitter2014-11-211-2/+2
| * | | Merge pull request #944 from jsit/carrotThomas Citharel2014-11-216-33/+52
| |\| |
| | * | Globalizing and creating two variants of Carrot.org icon; tidying up some CSSJay Sitter2014-11-216-33/+52
| |/ /
| * | fix merge confictThomas Citharel2014-11-194-5/+5
| |\ \ | |/ / |/| |
* | | Merge pull request #943 from wallabag/fixFlattrsThomas Citharel2014-11-194-6/+4
|\ \ \
| * | | fix FlattrsThomas Citharel2014-11-194-6/+4
|/ / /
| * | default deactivatedThomas Citharel2014-11-191-2/+2
| * | implementing carrot into wallabagThomas Citharel2014-11-1910-6/+15
|/ /
* | Merge pull request #938 from jsit/firefoxiconfixThomas Citharel2014-11-183-6/+6
|\ \ | |/ |/|
| * Fix for favicons in Firefox (FF only uses the last declared favicon, not the ...Jay Sitter2014-11-183-6/+6
|/
* Merge pull request #937 from jsit/faviconsThomas Citharel2014-11-1721-15/+83
|\
| * Adjusting Template class so that _global is ignored as a themeJay Sitter2014-11-171-2/+2
| * Modifying Courgette theme to comply with new app icon image locationJay Sitter2014-11-175-4/+27
| * Fixing earlier commit wherein I lowercased some JS callsJay Sitter2014-11-171-4/+4
| * Removing app icons from previous locationsJay Sitter2014-11-1713-0/+0
| * Moving app icon images to /themes/_global/img/appicon/, updating Baggy and De...Jay Sitter2014-11-1711-25/+47
| * Adding/fixing favicon <link>s in Baggy theme headerJay Sitter2014-11-171-4/+27
|/
* update constant versionThomas Citharel2014-11-161-2/+2
* 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
|\| | | | | |_|/ / |/| | |