Thomas Citharel
|
1256e4c645
|
Merge branch 'tcitworld-ebook' into dev
|
2014-12-14 00:16:39 +01:00 |
|
Thomas Citharel
|
dc69d3e8d8
|
merge epub with all the dev evolutions
|
2014-12-14 00:16:22 +01:00 |
|
Thomas Citharel
|
9c55ed0923
|
diaspora on all themes
|
2014-12-07 22:24:25 +01:00 |
|
Thomas Citharel
|
7c2c49d9b1
|
added diaspora sharing
|
2014-12-06 18:42:29 +01:00 |
|
Thomas Citharel
|
41bd2be68a
|
Merge pull request #958 from etiess/patch-2
Update wallabag_compatibility_test.php
|
2014-11-26 14:08:51 +01:00 |
|
etiess
|
66d7a4dcd8
|
Update wallabag_compatibility_test.php
Explain how to install Tidy
|
2014-11-26 14:07:27 +01:00 |
|
Thomas Citharel
|
b9c026ce32
|
Merge branch 'remove-courgette' into dev
Conflicts:
themes/courgette/_view.twig
|
2014-11-24 22:56:10 +01:00 |
|
Nicolas Lœuillet
|
485d57972e
|
Merge pull request #939 from jsit/globaljs
_global-izing some more js & css
|
2014-11-24 13:23:53 +01:00 |
|
Nicolas Lœuillet
|
85c5a1ff8d
|
failover if theme folder doesn't exist
|
2014-11-24 13:11:57 +01:00 |
|
Thomas Citharel
|
7b8bb75228
|
Merge pull request #942 from wallabag/carrot
implementing carrot into wallabag
|
2014-11-21 22:15:17 +01:00 |
|
Thomas Citharel
|
fe16457efc
|
Merge pull request #945 from jsit/carrot
Fixing icon text on unread page
|
2014-11-21 22:10:02 +01:00 |
|
Jay Sitter
|
46533cac7d
|
Fixing icon text on unread page
|
2014-11-21 16:07:15 -05:00 |
|
Thomas Citharel
|
747a15841d
|
Merge pull request #944 from jsit/carrot
Globalizing and creating two variants of Carrot.org icon
|
2014-11-21 21:47:37 +01:00 |
|
Jay Sitter
|
fc01f94387
|
Globalizing and creating two variants of Carrot.org icon; tidying up some CSS
|
2014-11-21 15:30:59 -05:00 |
|
Thomas Citharel
|
e9d4d17693
|
fix merge confict
|
2014-11-19 16:54:28 +01:00 |
|
Thomas Citharel
|
25f9c66834
|
Merge pull request #943 from wallabag/fixFlattrs
fix Flattrs
|
2014-11-19 16:40:36 +01:00 |
|
Thomas Citharel
|
d25a3f13c2
|
default deactivated
|
2014-11-19 16:40:02 +01:00 |
|
Thomas Citharel
|
b13376e918
|
fix Flattrs
|
2014-11-19 16:35:44 +01:00 |
|
Thomas Citharel
|
c8b4ef7fed
|
implementing carrot into wallabag
|
2014-11-19 16:27:56 +01:00 |
|
Thomas Citharel
|
b0f9f5ac21
|
Merge pull request #938 from jsit/firefoxiconfix
Fix for favicons in Firefox
|
2014-11-18 22:36:53 +01:00 |
|
Jay Sitter
|
6062f74c6b
|
Updating Baggy theme's head.twig to locate _global js/css
|
2014-11-18 10:07:32 -05:00 |
|
Jay Sitter
|
eb365a01fb
|
_global-izing some more js & css
|
2014-11-18 10:01:37 -05:00 |
|
Jay Sitter
|
eb0c88a9d4
|
Fix for favicons in Firefox (FF only uses the last declared favicon, not the most appropriate: https://bugzilla.mozilla.org/show_bug.cgi?id=751712)
|
2014-11-18 09:28:39 -05:00 |
|
Thomas Citharel
|
db3bffa284
|
Merge pull request #937 from jsit/favicons
Moving favicons to new _global theme dir and adjusting <link> tags
|
2014-11-17 23:15:47 +01:00 |
|
Jay Sitter
|
ca6c0de380
|
Adjusting Template class so that _global is ignored as a theme
|
2014-11-17 17:11:33 -05:00 |
|
Jay Sitter
|
d91ff81ca6
|
Modifying Courgette theme to comply with new app icon image location
|
2014-11-17 16:59:53 -05:00 |
|
Jay Sitter
|
9d2140c9a1
|
Fixing earlier commit wherein I lowercased some JS calls
|
2014-11-17 16:54:15 -05:00 |
|
Jay Sitter
|
7a0f454d39
|
Removing app icons from previous locations
|
2014-11-17 16:51:38 -05:00 |
|
Jay Sitter
|
d5b717dc77
|
Moving app icon images to /themes/_global/img/appicon/, updating Baggy and Default themes to point there
|
2014-11-17 16:49:34 -05:00 |
|
Jay Sitter
|
7cb517ce54
|
Adding/fixing favicon <link>s in Baggy theme header
|
2014-11-17 14:28:07 -05:00 |
|
Thomas Citharel
|
d0287608b6
|
update constant version
|
2014-11-16 02:29:01 +01:00 |
|
Nicolas Lœuillet
|
d3122db7b2
|
add DS_Store in gitignore
|
2014-11-08 08:25:00 +01:00 |
|
Nicolas Lœuillet
|
b46b8933ab
|
Merge pull request #926 from jsit/aboutlink
Fixing URL typo on about page
|
2014-11-05 17:24:05 +01:00 |
|
Jay Sitter
|
62f3e6db75
|
Fixing URL typo on about page
|
2014-11-05 11:22:22 -05:00 |
|
Thomas Citharel
|
217f3ca0b4
|
Merge pull request #921 from wallabag/about-page
add about page
|
2014-11-03 23:01:23 +01:00 |
|
Nicolas Lœuillet
|
3eba7538a4
|
Merge pull request #920 from jsit/uifixes
Many small UI changes/fixes to Baggy theme and English translation files
|
2014-11-03 22:48:07 +01:00 |
|
Nicolas Lœuillet
|
fa6f5db97f
|
Merge pull request #922 from jsit/menuhiding
Fixing menu hiding behavior when switching from mobile width to desktop width
|
2014-11-03 22:42:49 +01:00 |
|
Jay Sitter
|
ebea829d80
|
Improving class names for menu hiding
|
2014-11-03 13:32:20 -05:00 |
|
Jay Sitter
|
e319c49891
|
Fixing menu hiding behavior when switching from mobile width to desktop width
|
2014-11-03 13:28:58 -05:00 |
|
Jay Sitter
|
efd0a9f5f1
|
Applying changes to config.twig to default theme as well
|
2014-11-03 12:06:44 -05:00 |
|
Jay Sitter
|
94888d5fd4
|
Removing title text from bookmarklet
|
2014-11-03 09:13:42 -05:00 |
|
Jay Sitter
|
ac8b064f47
|
Restoring change password section in config
|
2014-11-03 09:11:25 -05:00 |
|
Nicolas Lœuillet
|
3c133bff49
|
add about page
|
2014-11-03 07:44:56 +01:00 |
|
Nicolas Lœuillet
|
20bb3f7f2a
|
Merge pull request #919 from jsit/popupjs_
Improving JavaScript for popup forms
|
2014-11-03 06:46:18 +01:00 |
|
Jay Sitter
|
cc1f78a83d
|
Many small UI changes/fixes to Baggy theme and English translation files. May need review.
|
2014-11-02 13:37:44 -05:00 |
|
Jay Sitter
|
ff02fd8aca
|
Improving JavaScript for popup forms
|
2014-11-02 11:19:21 -05:00 |
|
Jay Sitter
|
063a2fadaa
|
Removing spaces before colons on config screen
|
2014-11-02 10:30:13 -05:00 |
|
Jay Sitter
|
266b7328ef
|
Merge branch 'dev' into uitextcase
|
2014-11-01 18:29:41 -04:00 |
|
Thomas Citharel
|
893b8e4cef
|
Merge pull request #917 from jsit/menuopacity
Fixing opacity issue when using mobile menu (#912)
|
2014-10-31 20:45:40 +01:00 |
|
Jay Sitter
|
1772de2531
|
Changing my tabs to spaces :)
|
2014-10-31 15:38:25 -04:00 |
|