Commit Graph

787 Commits

Author SHA1 Message Date
tcit 4d99bae893 Fixed Multi-user system 2014-04-23 10:29:53 +02:00
Nicolas Lœuillet 847f57686e Merge pull request #642 from jplock/patch-2
Added IF NOT EXISTS
2014-04-14 15:42:09 +02:00
Justin Plock 44fd0faa23 Added IF NOT EXISTS 2014-04-14 09:40:35 -04:00
Nicolas Lœuillet df6c8b3be9 Merge pull request #637 from Bubbendorf/dev
Improvements on french translation
2014-04-13 12:50:48 +02:00
Amaury Carrade a192c21c6a Improved french translation 2014-04-13 00:02:03 +02:00
Nicolas Lœuillet f3312ce58d Merge pull request #635 from DmitrySandalov/dev
added missing image to dmagenta theme
2014-04-11 22:56:59 +02:00
Dmitry Sandalov 603ecb0052 added missing image to dmagenta theme 2014-04-12 00:08:11 +04:00
Nicolas Lœuillet 7256e9e139 1.6.1 version 2014-04-11 17:08:11 +02:00
Nicolas Lœuillet f09d76b0ea Merge pull request #633 from mariroz/dev
error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now.
2014-04-11 16:56:59 +02:00
Maryana Rozhankivska 0f859c6f32 error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now. 2014-04-11 17:21:54 +03:00
Nicolas Lœuillet 389d751e92 Merge pull request #632 from mariroz/dev
logging by import added; error by creation table if exists in postgresql...
2014-04-11 14:00:04 +02:00
Maryana Rozhankivska 5ce3978472 logging by import added; error by creation table if exists in postgresql fixed. 2014-04-11 14:43:17 +03:00
Nicolas Lœuillet d5f36a8d9e Merge pull request #623 from wallabag/fix-610
Fix display problem with smartphone and Baggy #610
2014-04-08 22:43:39 +02:00
Nicolas Lœuillet 08f539f738 responsive for search form #610 2014-04-08 22:42:34 +02:00
Nicolas Lœuillet 6e8030a0db [fix] display problem with smartphone and Baggy #610 2014-04-08 22:33:28 +02:00
Nicolas Lœuillet b96b075b55 Merge pull request #622 from wallabag/fix-612
[fix] Escap key displays save a link form #612
2014-04-08 22:11:17 +02:00
Nicolas Lœuillet f8e9d8bdbc [fix] Escap key displays save a link form #612 2014-04-08 22:10:40 +02:00
Nicolas Lœuillet bf20b541ae Merge pull request #621 from wallabag/fix-613
can't close search popup with the cross picture #613
2014-04-08 21:59:40 +02:00
Nicolas Lœuillet 3945335f39 can't close search popup with the cross picture #613 2014-04-08 21:58:44 +02:00
Nicolas Lœuillet 2c534c184d Merge pull request #618 from mariroz/dev
remove duplicates by import; code formatting changes: tabs replaced with spaces
2014-04-08 10:54:17 +02:00
Maryana Rozhankivska a8ef1f3f43 code formatting changes: tabs replaced with spaces, some other small formatting enhancements 2014-04-08 11:49:41 +03:00
Maryana Rozhankivska 86da39886d remove duplicates by import, code changes: tabs replaced with spaces 2014-04-08 11:41:06 +03:00
Nicolas Lœuillet a7f39918bf Merge pull request #614 from wallabag/fix-host-getpocheurl
[fix] with some config, http host is different
2014-04-07 15:45:26 +02:00
Nicolas Lœuillet 69c57493e7 [fix] with some config, http host is different 2014-04-07 15:44:05 +02:00
Nicolas Lœuillet 5fe1948097 Merge pull request #611 from wallabag/fix-french-locale
update french locale, thx to @goofy-bz and @Draky50110 #596
2014-04-07 15:15:42 +02:00
Nicolas Lœuillet d9b51a21fa update french locale, thx to @goofy-bz and @Draky50110 #596 2014-04-07 15:14:50 +02:00
Nicolas Lœuillet 9cb9ab552b Merge pull request #609 from wallabag/fix-desciption-typo
remove unnecessary variable declaration
2014-04-06 20:54:20 +02:00
Nicolas Lœuillet 7a873ef1d7 remove unnecessary variable declaration 2014-04-06 20:53:31 +02:00
Nicolas Lœuillet 292cd0dbd5 Merge pull request #606 from wallabag/fix-556
in RSS feed, add link to wallabag URL #556
2014-04-06 16:40:17 +02:00
Nicolas Lœuillet f86784c22d in RSS feed, add link to wallabag URL #556 2014-04-06 16:39:11 +02:00
Nicolas Lœuillet 2dd5c1e4a3 Merge pull request #605 from wallabag/fix-604
[fix] Use of undefined constant ATOM #604
2014-04-06 16:22:57 +02:00
Nicolas Lœuillet 29d9c0ffe1 [fix] Use of undefined constant ATOM #604 2014-04-06 16:21:48 +02:00
Nicolas Lœuillet d7ee9f986b Merge pull request #603 from mariroz/dev
postgres sequence error fix, issue #602
2014-04-05 12:36:20 +02:00
Maryana Rozhankivska 1bcbe8bebf postgres sequence error fix, issue #602 2014-04-05 11:22:33 +03:00
tcitworld db117db3c5 Fix to #600 2014-04-04 22:36:33 +02:00
tcitworld 4a16f33dcc Changed copyright to 2014
Happy new year !
2014-04-04 22:13:06 +02:00
Nicolas Lœuillet 7d2f1aa279 [add] link on config page to fetch content 2014-04-03 14:39:13 +02:00
Nicolas Lœuillet bfa32856bc yeah, 1.6, one year after the 1st commit 2014-04-03 13:54:06 +02:00
Maryana Rozhankivska 06e1a9a98a import w/o cron: fix of "click to finish import" in baggy theme 2014-04-03 14:35:50 +03:00
Maryana Rozhankivska d9bb0cdeb8 import w/o cron: explanation added 2014-04-03 13:53:47 +03:00
Maryana Rozhankivska 4d2bd6e507 import w/o cron: error in url fix 2014-04-03 13:19:54 +03:00
Maryana Rozhankivska a297fb1e38 import w/o cron 2014-04-03 12:18:49 +03:00
Maryana Rozhankivska a4585f7eaa import without cron 2014-04-02 22:33:06 +03:00
Maryana Rozhankivska 182faf2696 import without cron 2014-04-02 20:55:19 +03:00
tcit d967a1fa14 Important fixes for search engine (thx @mariroz)
So sorry for the mess... :(
* search only in users' own articles
* sanitized what is searched
* display what is searched
* pagination, sorting available when searching
* use existing function to query db
* bad encoding caracters fixed
* link to JQuery into default theme, no longer in each theme
* some spaces instead of tabs
2014-04-02 17:44:47 +02:00
Nicolas Lœuillet 22db488d21 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-03-30 21:17:28 +02:00
Nicolas Lœuillet 1be13ba1fc oops, restore @tcitworld commit. I'm so tired 2014-03-30 21:16:45 +02:00
Nicolas Lœuillet d6d8a045e6 Merge pull request #588 from mariroz/dev
fix of bug with default theme constant
2014-03-30 20:04:55 +02:00
Nicolas Lœuillet 1d0995bb8e [fix] undefined vars in install script 2014-03-30 19:57:39 +02:00
Maryana Rozhankivska 3345c9dc39 fix of bug with default theme constant 2014-03-28 21:19:08 +02:00