]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
restructure folders
authorNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 20 Jan 2015 13:11:26 +0000 (14:11 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 20 Jan 2015 13:11:26 +0000 (14:11 +0100)
190 files changed:
.gitignore
app/cache/.gitignore [deleted file]
app/cache/.htaccess [deleted file]
app/config/config.inc.default.php
app/db/poche.sqlite
composer.json
composer.lock
src/Wallabag/Wallabag/Database.php
src/Wallabag/Wallabag/Language.php
src/Wallabag/Wallabag/Template.php
src/Wallabag/Wallabag/Tools.php
src/Wallabag/Wallabag/Wallabag.php
themes/_global/public/css/jquery-ui-1.10.4.custom.css [moved from themes/_global/css/jquery-ui-1.10.4.custom.css with 100% similarity]
themes/_global/public/css/jquery-ui-1.10.4.custom.min.css [moved from themes/_global/css/jquery-ui-1.10.4.custom.min.css with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-114.png [moved from themes/_global/img/appicon/apple-touch-icon-114.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-120.png [moved from themes/_global/img/appicon/apple-touch-icon-120.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-144.png [moved from themes/_global/img/appicon/apple-touch-icon-144.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-152.png [moved from themes/_global/img/appicon/apple-touch-icon-152.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-57.png [moved from themes/_global/img/appicon/apple-touch-icon-57.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-72.png [moved from themes/_global/img/appicon/apple-touch-icon-72.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon-76.png [moved from themes/_global/img/appicon/apple-touch-icon-76.png with 100% similarity]
themes/_global/public/img/appicon/apple-touch-icon.png [moved from themes/_global/img/appicon/apple-touch-icon.png with 100% similarity]
themes/_global/public/img/appicon/favicon.ico [moved from themes/_global/img/appicon/favicon.ico with 100% similarity]
themes/_global/public/img/icons/carrot-icon--black.png [moved from themes/_global/img/icons/carrot-icon--black.png with 100% similarity]
themes/_global/public/img/icons/carrot-icon--white.png [moved from themes/_global/img/icons/carrot-icon--white.png with 100% similarity]
themes/_global/public/img/icons/diaspora-icon--black.png [moved from themes/_global/img/icons/diaspora-icon--black.png with 100% similarity]
themes/_global/public/img/icons/diaspora-icon--white.png [moved from themes/_global/img/icons/diaspora-icon--white.png with 100% similarity]
themes/_global/public/js/autoClose.js [moved from themes/_global/js/autoClose.js with 100% similarity]
themes/_global/public/js/autoCompleteTags.js [moved from themes/_global/js/autoCompleteTags.js with 100% similarity]
themes/_global/public/js/jquery-2.0.3.min.js [moved from themes/_global/js/jquery-2.0.3.min.js with 100% similarity]
themes/_global/public/js/jquery-ui-1.10.4.custom.js [moved from themes/_global/js/jquery-ui-1.10.4.custom.js with 100% similarity]
themes/_global/public/js/jquery-ui-1.10.4.custom.min.js [moved from themes/_global/js/jquery-ui-1.10.4.custom.min.js with 100% similarity]
themes/_global/public/js/popupForm.js [moved from themes/_global/js/popupForm.js with 100% similarity]
themes/_global/public/js/restoreScroll.js [moved from themes/_global/js/restoreScroll.js with 100% similarity]
themes/_global/public/js/saveLink.js [moved from themes/_global/js/saveLink.js with 100% similarity]
themes/baggy/about.twig
themes/baggy/config.twig
themes/baggy/public/css/font.css [moved from themes/baggy/css/font.css with 100% similarity]
themes/baggy/public/css/main.css [moved from themes/baggy/css/main.css with 100% similarity]
themes/baggy/public/css/messages.css [moved from themes/baggy/css/messages.css with 100% similarity]
themes/baggy/public/css/print.css [moved from themes/baggy/css/print.css with 100% similarity]
themes/baggy/public/css/ratatouille.css [moved from themes/baggy/css/ratatouille.css with 100% similarity]
themes/baggy/public/fonts/icomoon.eot [moved from themes/baggy/fonts/icomoon.eot with 100% similarity]
themes/baggy/public/fonts/icomoon.svg [moved from themes/baggy/fonts/icomoon.svg with 100% similarity]
themes/baggy/public/fonts/icomoon.ttf [moved from themes/baggy/fonts/icomoon.ttf with 100% similarity]
themes/baggy/public/fonts/icomoon.woff [moved from themes/baggy/fonts/icomoon.woff with 100% similarity]
themes/baggy/public/fonts/ptsans.woff [moved from themes/baggy/fonts/ptsans.woff with 100% similarity]
themes/baggy/public/img/baggy/blank.png [moved from themes/baggy/img/baggy/blank.png with 100% similarity]
themes/baggy/public/img/baggy/down.png [moved from themes/baggy/img/baggy/down.png with 100% similarity]
themes/baggy/public/img/baggy/list.png [moved from themes/baggy/img/baggy/list.png with 100% similarity]
themes/baggy/public/img/baggy/table.png [moved from themes/baggy/img/baggy/table.png with 100% similarity]
themes/baggy/public/img/baggy/top.png [moved from themes/baggy/img/baggy/top.png with 100% similarity]
themes/baggy/public/img/bg-select.png [moved from themes/baggy/img/bg-select.png with 100% similarity]
themes/baggy/public/img/logo-other_themes.png [moved from themes/baggy/img/logo-other_themes.png with 100% similarity]
themes/baggy/public/img/logo-w.png [moved from themes/baggy/img/logo-w.png with 100% similarity]
themes/baggy/public/img/logo-wallabag.svg [moved from themes/baggy/img/logo-wallabag.svg with 100% similarity]
themes/baggy/public/img/logo.png [moved from themes/baggy/img/logo.png with 100% similarity]
themes/baggy/public/img/logo.svg [moved from themes/baggy/img/logo.svg with 100% similarity]
themes/baggy/public/js/closeMessage.js [moved from themes/baggy/js/closeMessage.js with 100% similarity]
themes/baggy/public/js/init.js [moved from themes/baggy/js/init.js with 100% similarity]
themes/baggy/public/js/jquery.cookie.js [moved from themes/baggy/js/jquery.cookie.js with 100% similarity]
themes/baggy/public/js/restoreScroll.js [moved from themes/baggy/js/restoreScroll.js with 100% similarity]
themes/dark/public/css/style-dark.css [moved from themes/dark/css/style-dark.css with 100% similarity]
themes/dark/public/img/dark/backtotop.png [moved from themes/dark/img/dark/backtotop.png with 100% similarity]
themes/dark/public/img/dark/bad-display.png [moved from themes/dark/img/dark/bad-display.png with 100% similarity]
themes/dark/public/img/dark/checkmark-off.png [moved from themes/dark/img/dark/checkmark-off.png with 100% similarity]
themes/dark/public/img/dark/checkmark-on.png [moved from themes/dark/img/dark/checkmark-on.png with 100% similarity]
themes/dark/public/img/dark/down.png [moved from themes/dark/img/dark/down.png with 100% similarity]
themes/dark/public/img/dark/envelop.png [moved from themes/dark/img/dark/envelop.png with 100% similarity]
themes/dark/public/img/dark/flattr.png [moved from themes/dark/img/dark/flattr.png with 100% similarity]
themes/dark/public/img/dark/left.png [moved from themes/dark/img/dark/left.png with 100% similarity]
themes/dark/public/img/dark/link.png [moved from themes/dark/img/dark/link.png with 100% similarity]
themes/dark/public/img/dark/remove.png [moved from themes/dark/img/dark/remove.png with 100% similarity]
themes/dark/public/img/dark/rss.png [moved from themes/dark/img/dark/rss.png with 100% similarity]
themes/dark/public/img/dark/shaarli.png [moved from themes/dark/img/dark/shaarli.png with 100% similarity]
themes/dark/public/img/dark/star-off.png [moved from themes/dark/img/dark/star-off.png with 100% similarity]
themes/dark/public/img/dark/star-on.png [moved from themes/dark/img/dark/star-on.png with 100% similarity]
themes/dark/public/img/dark/top.png [moved from themes/dark/img/dark/top.png with 100% similarity]
themes/dark/public/img/dark/twitter.png [moved from themes/dark/img/dark/twitter.png with 100% similarity]
themes/dark/public/public [new symlink]
themes/default/_footer.twig
themes/default/about.twig
themes/default/config.twig
themes/default/public/css/images/animated-overlay.gif [moved from themes/default/css/images/animated-overlay.gif with 100% similarity]
themes/default/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png [moved from themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png with 100% similarity]
themes/default/public/css/images/ui-bg_flat_75_ffffff_40x100.png [moved from themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png with 100% similarity]
themes/default/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png [moved from themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png with 100% similarity]
themes/default/public/css/images/ui-bg_glass_65_ffffff_1x400.png [moved from themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png with 100% similarity]
themes/default/public/css/images/ui-bg_glass_75_dadada_1x400.png [moved from themes/default/css/images/ui-bg_glass_75_dadada_1x400.png with 100% similarity]
themes/default/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png [moved from themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png with 100% similarity]
themes/default/public/css/images/ui-bg_glass_95_fef1ec_1x400.png [moved from themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png with 100% similarity]
themes/default/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png [moved from themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png with 100% similarity]
themes/default/public/css/images/ui-icons_222222_256x240.png [moved from themes/default/css/images/ui-icons_222222_256x240.png with 100% similarity]
themes/default/public/css/images/ui-icons_2e83ff_256x240.png [moved from themes/default/css/images/ui-icons_2e83ff_256x240.png with 100% similarity]
themes/default/public/css/images/ui-icons_454545_256x240.png [moved from themes/default/css/images/ui-icons_454545_256x240.png with 100% similarity]
themes/default/public/css/images/ui-icons_888888_256x240.png [moved from themes/default/css/images/ui-icons_888888_256x240.png with 100% similarity]
themes/default/public/css/images/ui-icons_cd0a0a_256x240.png [moved from themes/default/css/images/ui-icons_cd0a0a_256x240.png with 100% similarity]
themes/default/public/css/knacss.css [moved from themes/default/css/knacss.css with 100% similarity]
themes/default/public/css/messages.css [moved from themes/default/css/messages.css with 100% similarity]
themes/default/public/css/print.css [moved from themes/default/css/print.css with 100% similarity]
themes/default/public/css/style-default.css [moved from themes/default/css/style-default.css with 100% similarity]
themes/default/public/css/style.css [moved from themes/default/css/style.css with 100% similarity]
themes/default/public/fonts/Roboto.woff [moved from themes/default/fonts/Roboto.woff with 100% similarity]
themes/default/public/highlightjs/highlight.pack.js [moved from themes/default/highlightjs/highlight.pack.js with 100% similarity]
themes/default/public/highlightjs/styles/default.css [moved from themes/default/highlightjs/styles/default.css with 100% similarity]
themes/default/public/highlightjs/styles/github.css [moved from themes/default/highlightjs/styles/github.css with 100% similarity]
themes/default/public/highlightjs/styles/googlecode.css [moved from themes/default/highlightjs/styles/googlecode.css with 100% similarity]
themes/default/public/img/default/backtotop.png [moved from themes/default/img/default/backtotop.png with 100% similarity]
themes/default/public/img/default/bad-display.png [moved from themes/default/img/default/bad-display.png with 100% similarity]
themes/default/public/img/default/checkmark-off.png [moved from themes/default/img/default/checkmark-off.png with 100% similarity]
themes/default/public/img/default/checkmark-on.png [moved from themes/default/img/default/checkmark-on.png with 100% similarity]
themes/default/public/img/default/down.png [moved from themes/default/img/default/down.png with 100% similarity]
themes/default/public/img/default/envelop.png [moved from themes/default/img/default/envelop.png with 100% similarity]
themes/default/public/img/default/flattr.png [moved from themes/default/img/default/flattr.png with 100% similarity]
themes/default/public/img/default/left.png [moved from themes/default/img/default/left.png with 100% similarity]
themes/default/public/img/default/link.png [moved from themes/default/img/default/link.png with 100% similarity]
themes/default/public/img/default/print.png [moved from themes/default/img/default/print.png with 100% similarity]
themes/default/public/img/default/remove.png [moved from themes/default/img/default/remove.png with 100% similarity]
themes/default/public/img/default/rss.png [moved from themes/default/img/default/rss.png with 100% similarity]
themes/default/public/img/default/shaarli.png [moved from themes/default/img/default/shaarli.png with 100% similarity]
themes/default/public/img/default/star-off.png [moved from themes/default/img/default/star-off.png with 100% similarity]
themes/default/public/img/default/star-on.png [moved from themes/default/img/default/star-on.png with 100% similarity]
themes/default/public/img/default/top.png [moved from themes/default/img/default/top.png with 100% similarity]
themes/default/public/img/default/twitter.png [moved from themes/default/img/default/twitter.png with 100% similarity]
themes/default/public/img/logo.svg [moved from themes/default/img/logo.svg with 100% similarity]
themes/default/public/img/messages/close.png [moved from themes/default/img/messages/close.png with 100% similarity]
themes/default/public/img/messages/cross.png [moved from themes/default/img/messages/cross.png with 100% similarity]
themes/default/public/img/messages/help.png [moved from themes/default/img/messages/help.png with 100% similarity]
themes/default/public/img/messages/tick.png [moved from themes/default/img/messages/tick.png with 100% similarity]
themes/default/public/img/messages/warning.png [moved from themes/default/img/messages/warning.png with 100% similarity]
themes/default/public/js/closeMessage.js [moved from themes/default/js/closeMessage.js with 100% similarity]
themes/dmagenta/public/css/style-dmagenta.css [moved from themes/dmagenta/css/style-dmagenta.css with 100% similarity]
themes/dmagenta/public/img/dmagenta/backtotop.png [moved from themes/dmagenta/img/dmagenta/backtotop.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/bad-display.png [moved from themes/dmagenta/img/dmagenta/bad-display.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/checkmark-off.png [moved from themes/dmagenta/img/dmagenta/checkmark-off.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/checkmark-on.png [moved from themes/dmagenta/img/dmagenta/checkmark-on.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/down.png [moved from themes/dmagenta/img/dmagenta/down.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/envelop.png [moved from themes/dmagenta/img/dmagenta/envelop.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/flattr.png [moved from themes/dmagenta/img/dmagenta/flattr.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/left.png [moved from themes/dmagenta/img/dmagenta/left.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/link.png [moved from themes/dmagenta/img/dmagenta/link.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/remove.png [moved from themes/dmagenta/img/dmagenta/remove.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/rss.png [moved from themes/dmagenta/img/dmagenta/rss.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/shaarli.png [moved from themes/dmagenta/img/dmagenta/shaarli.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/star-off.png [moved from themes/dmagenta/img/dmagenta/star-off.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/star-on.png [moved from themes/dmagenta/img/dmagenta/star-on.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/top.png [moved from themes/dmagenta/img/dmagenta/top.png with 100% similarity]
themes/dmagenta/public/img/dmagenta/twitter.png [moved from themes/dmagenta/img/dmagenta/twitter.png with 100% similarity]
themes/solarized-dark/public/css/style-solarized-dark.css [moved from themes/solarized-dark/css/style-solarized-dark.css with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/backtotop.png [moved from themes/solarized-dark/img/solarized-dark/backtotop.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/bad-display.png [moved from themes/solarized-dark/img/solarized-dark/bad-display.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/checkmark-off.png [moved from themes/solarized-dark/img/solarized-dark/checkmark-off.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/checkmark-on.png [moved from themes/solarized-dark/img/solarized-dark/checkmark-on.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/down.png [moved from themes/solarized-dark/img/solarized-dark/down.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/envelop.png [moved from themes/solarized-dark/img/solarized-dark/envelop.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/flattr.png [moved from themes/solarized-dark/img/solarized-dark/flattr.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/left.png [moved from themes/solarized-dark/img/solarized-dark/left.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/link.png [moved from themes/solarized-dark/img/solarized-dark/link.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/remove.png [moved from themes/solarized-dark/img/solarized-dark/remove.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/rss.png [moved from themes/solarized-dark/img/solarized-dark/rss.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/shaarli.png [moved from themes/solarized-dark/img/solarized-dark/shaarli.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/star-off.png [moved from themes/solarized-dark/img/solarized-dark/star-off.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/star-on.png [moved from themes/solarized-dark/img/solarized-dark/star-on.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/top.png [moved from themes/solarized-dark/img/solarized-dark/top.png with 100% similarity]
themes/solarized-dark/public/img/solarized-dark/twitter.png [moved from themes/solarized-dark/img/solarized-dark/twitter.png with 100% similarity]
themes/solarized/public/css/style-solarized.css [moved from themes/solarized/css/style-solarized.css with 100% similarity]
themes/solarized/public/img/solarized/backtotop.png [moved from themes/solarized/img/solarized/backtotop.png with 100% similarity]
themes/solarized/public/img/solarized/bad-display.png [moved from themes/solarized/img/solarized/bad-display.png with 100% similarity]
themes/solarized/public/img/solarized/checkmark-off.png [moved from themes/solarized/img/solarized/checkmark-off.png with 100% similarity]
themes/solarized/public/img/solarized/checkmark-on.png [moved from themes/solarized/img/solarized/checkmark-on.png with 100% similarity]
themes/solarized/public/img/solarized/down.png [moved from themes/solarized/img/solarized/down.png with 100% similarity]
themes/solarized/public/img/solarized/envelop.png [moved from themes/solarized/img/solarized/envelop.png with 100% similarity]
themes/solarized/public/img/solarized/flattr.png [moved from themes/solarized/img/solarized/flattr.png with 100% similarity]
themes/solarized/public/img/solarized/left.png [moved from themes/solarized/img/solarized/left.png with 100% similarity]
themes/solarized/public/img/solarized/link.png [moved from themes/solarized/img/solarized/link.png with 100% similarity]
themes/solarized/public/img/solarized/remove.png [moved from themes/solarized/img/solarized/remove.png with 100% similarity]
themes/solarized/public/img/solarized/rss.png [moved from themes/solarized/img/solarized/rss.png with 100% similarity]
themes/solarized/public/img/solarized/shaarli.png [moved from themes/solarized/img/solarized/shaarli.png with 100% similarity]
themes/solarized/public/img/solarized/star-off.png [moved from themes/solarized/img/solarized/star-off.png with 100% similarity]
themes/solarized/public/img/solarized/star-on.png [moved from themes/solarized/img/solarized/star-on.png with 100% similarity]
themes/solarized/public/img/solarized/top.png [moved from themes/solarized/img/solarized/top.png with 100% similarity]
themes/solarized/public/img/solarized/twitter.png [moved from themes/solarized/img/solarized/twitter.png with 100% similarity]
web/index.php
web/themes/_global [new symlink]
web/themes/baggy [new symlink]
web/themes/dark [new symlink]
web/themes/default [new symlink]
web/themes/dmagenta [new symlink]
web/themes/solarized [new symlink]
web/themes/solarized-dark [new symlink]

index e4979f3182f65a3140332e30f8a290485b0ae327..94f83ba4b10afe0917e0340d63c7ca514a0bfc9c 100644 (file)
@@ -1,3 +1,4 @@
+.idea
 .DS_Store
 .vagrant
 app/assets/*
diff --git a/app/cache/.gitignore b/app/cache/.gitignore
deleted file mode 100644 (file)
index 35c8ca2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-!.htaccess
diff --git a/app/cache/.htaccess b/app/cache/.htaccess
deleted file mode 100644 (file)
index 93169e4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all
index 09095235d113e7508f85c859b3b41e01da9335f8..f77ef56606d806724619c1fcaa6f37cbb6b52c6a 100755 (executable)
@@ -67,7 +67,7 @@
 @define ('DEFAULT_THEME', 'baggy');
 
 @define ('THEME', ROOT . '/themes');
-@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations/locale');
+@define ('LOCALE', ROOT . '/src/Wallabag/Wallabag/Resources/translations');
 @define ('CACHE', ROOT . '/app/cache');
 
 @define ('PAGINATION', '12');
index 3d1a8e43b3b169bd9762171e8a92cd52cf9da782..9e9e52cb16bddd654229d0dd42ceba3395aa047e 100755 (executable)
Binary files a/app/db/poche.sqlite and b/app/db/poche.sqlite differ
index a1dee4108e4b5d6ee9abb164206df48848164404..e04ec2526cee92f56bd059e522e53facb740cbfa 100644 (file)
@@ -75,7 +75,7 @@
         "phpunit/phpunit": "~3.7"
     },
     "autoload": {
-        "psr-0": { "Wallabag\\Wallabag": "src/" }
+        "psr-4": { "Wallabag\\": "src/Wallabag" }
     },
     "config": {
         "bin-dir": "bin"
index 9888e4c4204678e07d03352e014aaa240bcfec02..f2c17481043bbd89975dadba3551509391456446 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7915fd3c1343f447145fb167b0bb4d36",
+    "hash": "6fa216371c9d7577a117526db6f07407",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
index afda69de56e2cd0ffb87b8f3c647c30915b12050..fa13291019bc15b4709281b0e807fb5a621e3675 100755 (executable)
@@ -10,6 +10,8 @@
 
 namespace Wallabag\Wallabag;
 
+use \PDO;
+
 class Database {
 
     var $handle;
index 434118176903c8f47385d56f2ac9d169392712b8..a8fbbc3557bf4e87f8cd5f913fd28ceba3b90028 100644 (file)
@@ -10,6 +10,8 @@
 
 namespace Wallabag\Wallabag;
 
+use \Session;
+
 class Language
 {
     protected $wallabag;
@@ -38,7 +40,7 @@ class Language
         $pocheUser = Session::getParam('poche_user');
         $language  = (is_null($pocheUser) ? LANG : $pocheUser->getConfigValue('language'));
 
-        @putenv('LC_ALL=' . $language);
+        putenv('LC_ALL=' . $language);
         setlocale(LC_ALL, $language);
         bindtextdomain($language, LOCALE);
         textdomain($language);
index e8a6daa3b636091e8657dd2323c2744136b48e18..d0fc9b071576d4568be22dc94cac14de888990d1 100644 (file)
 
 namespace Wallabag\Wallabag;
 
+use \Twig_Environment;
+use \Session;
+use \Twig_Loader_Chain;
+use \Twig_Loader_Filesystem;
+use \Twig_Extensions_Extension_I18n;
+use \Twig_SimpleFilter;
+
 class Template extends Twig_Environment
 {
     protected $wallabag;
@@ -117,11 +124,11 @@ class Template extends Twig_Environment
         $this->addExtension(new Twig_Extensions_Extension_I18n());
 
         # filter to display domain name of an url
-        $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain');
+        $filter = new Twig_SimpleFilter('getDomain', 'Wallabag\\Wallabag\\Tools::getDomain');
         $this->addFilter($filter);
 
         # filter for reading time
-        $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime');
+        $filter = new Twig_SimpleFilter('getReadingTime', 'Wallabag\\Wallabag\\Tools::getReadingTime');
         $this->addFilter($filter);
     }
 
index 19d98614a16ba97a58645f691ae7a27c48179de6..9350c660187e84097ce037da508d9e2c6c185888 100755 (executable)
@@ -10,6 +10,9 @@
 
 namespace Wallabag\Wallabag;
 
+use \RecursiveIteratorIterator;
+use \RecursiveDirectoryIterator;
+
 final class Tools
 {
     /**
index c172a95d1b4ea92d6ba566775e17acba6cb5a743..0a498ebf181ab00492d84bbad82b6f291b8d34f2 100755 (executable)
 
 namespace Wallabag\Wallabag;
 
+use \Paginator;
+use \Session;
+use \Messages;
+use \FeedWriter;
+
 class Wallabag
 {
     /**
@@ -50,7 +55,7 @@ class Wallabag
     {
         Tools::initPhp();
 
-        $pocheUser = Session::getParam('poche_user');
+        $pocheUser = \Session::getParam('poche_user');
 
         if ($pocheUser && $pocheUser != array()) {
             $this->user = $pocheUser;
index 110196a621fdbebd9e78ef4e6816368ff6497790..d18fe1567f53187f0b8972a5321a40f940d76b64 100755 (executable)
@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
index a5a615597ec3cefb0dfd4e1c7822748eaa41e704..6031f489c00e6f6a4679120593aa2925b107ba33 100755 (executable)
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
diff --git a/themes/dark/public/public b/themes/dark/public/public
new file mode 120000 (symlink)
index 0000000..fd316b3
--- /dev/null
@@ -0,0 +1 @@
+../../themes/default/public
\ No newline at end of file
index 3057cb755972b0c9d440f6df138f1eb39c3096c9..213a4acad4b0fc7c4a2383102ca32d80fdf6d84b 100644 (file)
@@ -1,4 +1,4 @@
         <footer class="w600p center mt3 mb3 smaller txtright">
             <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
-            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
+            {% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
         </footer>
\ No newline at end of file
index 5ca3217c99dcd85d8dd4484d9bb797f52a0c8438..50ffd8ef4083004748f780d8dcf390bac324fd65 100755 (executable)
@@ -24,7 +24,7 @@
         <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
 
         <dt>{% trans "Version" %}</dt>
-        <dd>{{ constant('POCHE') }}</dd>
+        <dd>{{ constant('WALLABAG') }}</dd>
     </dl>
 
     <p>{% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}</p>
index bac563cf2d31a1fbe64667f2324d9f871411c7f3..b7d91937bf69dda69e2ffd4a7b22f2fa4e98944a 100755 (executable)
 
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
-                <li>{% trans "Installed version" %}: <strong>{{ constant('POCHE') }}</strong></li>
+                <li>{% trans "Installed version" %}: <strong>{{ constant('WALLABAG') }}</strong></li>
                 <li>{% trans "Latest stable version" %}: {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %}: {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
index 053557271bb52936fe02da3c6ef80233195eb010..84e49eb1c8ff2bea87de9cc2ea3e083940d916ee 100644 (file)
@@ -10,6 +10,8 @@
 
 define ('WALLABAG', '2.0.0-alpha');
 
+use Wallabag\Wallabag\Wallabag;
+
 require_once '../app/check_essentials.php';
 require_once '../app/check_setup.php';
 require_once '../app/config/global.inc.php';
@@ -23,5 +25,5 @@ Session::$sessionName = 'wallabag';
 Session::init();
 
 // Let's rock !
-$wallabag = new Wallabag\Wallabag\Wallabag();
+$wallabag = new Wallabag();
 $wallabag->run();
\ No newline at end of file
diff --git a/web/themes/_global b/web/themes/_global
new file mode 120000 (symlink)
index 0000000..4790426
--- /dev/null
@@ -0,0 +1 @@
+../../themes/_global/public
\ No newline at end of file
diff --git a/web/themes/baggy b/web/themes/baggy
new file mode 120000 (symlink)
index 0000000..9e84890
--- /dev/null
@@ -0,0 +1 @@
+../../themes/baggy/public
\ No newline at end of file
diff --git a/web/themes/dark b/web/themes/dark
new file mode 120000 (symlink)
index 0000000..b5b4c1d
--- /dev/null
@@ -0,0 +1 @@
+../../themes/dark/public
\ No newline at end of file
diff --git a/web/themes/default b/web/themes/default
new file mode 120000 (symlink)
index 0000000..fd316b3
--- /dev/null
@@ -0,0 +1 @@
+../../themes/default/public
\ No newline at end of file
diff --git a/web/themes/dmagenta b/web/themes/dmagenta
new file mode 120000 (symlink)
index 0000000..222bb6d
--- /dev/null
@@ -0,0 +1 @@
+../../themes/dmagenta/public
\ No newline at end of file
diff --git a/web/themes/solarized b/web/themes/solarized
new file mode 120000 (symlink)
index 0000000..426a3ac
--- /dev/null
@@ -0,0 +1 @@
+../../themes/solarized/public
\ No newline at end of file
diff --git a/web/themes/solarized-dark b/web/themes/solarized-dark
new file mode 120000 (symlink)
index 0000000..822b612
--- /dev/null
@@ -0,0 +1 @@
+../../themes/solarized-dark/public
\ No newline at end of file