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
tcit
fecb62a396
Improvements to install script
...
* automatically remove install/ folder
* go easier though the compatibility test <-> install script pages
* Small fixes which raised php warnings
2014-03-28 20:00:02 +01:00
tcit
ad697686c0
Final Fix of #570
...
Adds a date information to the exported data file.
2014-03-28 16:53:06 +01:00
Nicolas Lœuillet
cdada41505
Merge pull request #587 from mariroz/dev
...
problem with resources and localhost url fix
2014-03-28 10:30:51 +01:00
Maryana Rozhankivska
08718c01e4
problem with resources and localhost url fix
2014-03-28 11:26:48 +02:00
tcit
b152f2b6ba
Fix to bug #570
...
Forces the download of the data exported file as a poche-export file.
2014-03-28 00:57:07 +01:00
Nicolas Lœuillet
04fbe8f5ef
Merge pull request #586 from mariroz/wb-link-in-wb
...
wallabag a link in wallabag now in default theme, issue #505
2014-03-27 19:44:28 +01:00
Maryana Rozhankivska
e68348f627
wallabag a link in wallabag now in default theme, issue #505
2014-03-27 18:21:30 +02:00
Nicolas Lœuillet
9591ee2603
Merge pull request #585 from kevmeyer/dev
...
updated german localisation
2014-03-27 13:56:40 +01:00
Kevin Meyer
5814ef0d25
updated german localisation
2014-03-27 13:44:19 +01:00
tcit
d607330557
Improvements for compatibility_test file
...
- gettext detection (not default on WAMP) ; part fix of #579
- added colors to make viewing what's wrong better and quicker
(green/orange/red)
- added a link to index.php if it's good
2014-03-26 18:46:46 +01:00
tcit
ad03eb6286
Fix of #580 : Add some random for Windows hosts
2014-03-26 17:19:57 +01:00
tcit
cc60cbbbab
Finished search engine function
...
Now searches also in title and in original url
2014-03-26 16:36:42 +01:00
Nicolas Lœuillet
d619120fc4
Merge pull request #582 from mariroz/fix-session-livetime
...
fix of localhost cookie related to nginx binding to 0.0.0.0
2014-03-24 11:12:56 +01:00
tcit
2c4e7a1cea
Fixes to search engine
...
Changed the search parameter from POST to GET.
Also, adapted the Baggy theme.
2014-03-23 23:52:05 +01:00
tcit
a33a3d2afb
Implemented rudimental search engine
2014-03-22 11:09:18 +01:00
Maryana Rozhankivska
03832b45e1
fix of localhost cookie related to nginx binding to 0.0.0.0
2014-03-21 21:56:40 +02:00
Nicolas Lœuillet
028e34b6c4
Merge pull request #581 from mariroz/fix-session-livetime
...
fix of issue under nginx and php-fpm
2014-03-21 14:05:51 +01:00
Maryana Rozhankivska
ad53faf25c
fix of issue under nginx and php-fpm
2014-03-21 14:59:30 +02:00
Nicolas Lœuillet
0c51bfea6f
Merge pull request #576 from mariroz/fix-session-livetime
...
fix of _SESSION - indefined variable
2014-03-19 19:26:05 +01:00
Maryana Rozhankivska
6fa3f70bc2
fix of _SESSION - indefined variable
2014-03-19 19:22:04 +02:00
Nicolas Lœuillet
db41c907aa
Merge pull request #572 from mariroz/fix-session-livetime
...
fix of #115 , server relater config value added
2014-03-18 21:29:58 +01:00
Maryana Rozhankivska
2a97194253
fix of #115 , server relater config value added
2014-03-18 17:39:19 +02:00
Nicolas Lœuillet
a7048bc45d
Merge pull request #567 from mariroz/fix-session-livetime
...
fix of #115 - stay connected and session livetime
2014-03-17 21:49:42 +01:00
Maryana Rozhankivska
eb5b677250
fix of #115 - stay connected and session livetime
2014-03-17 22:22:05 +02:00
Nicolas Lœuillet
897b2b5302
Merge pull request #566 from camporez/dev
...
Update brazilian traslation title to "Português (Brasil)"
2014-03-17 08:09:18 +01:00
camporez
5805ac4574
Update brazilian traslation title to "Português (Brasil)"
2014-03-16 16:43:46 -03:00
Nicolas Lœuillet
07e028fe5c
Merge pull request #563 from camporez/dev
...
Update brazilian translation
2014-03-16 18:55:59 +01:00
camporez
08dde123b1
Correct README.md
2014-03-16 11:58:16 -03:00
camporez
82cff5af70
Update brazilian translation
2014-03-15 17:23:34 -03:00
camporez
8754bd88a5
Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev
2014-03-15 15:03:26 -03:00
camporez
6a915551ab
acc
2014-03-14 14:15:26 -03:00
Nicolas Lœuillet
ed02e38e1d
[fix] in RSS, link to original article
2014-03-14 09:35:48 +01:00
Nicolas Lœuillet
8d7cd2ccd5
[add] remove import file in CACHE when import is over
2014-03-14 08:54:44 +01:00
Nicolas Lœuillet
c0586a906c
[fix] new import section in old themes #559
2014-03-14 08:37:40 +01:00
Nicolas Lœuillet
181d16fe22
Merge pull request #557 from mariroz/feature-add-link-inside-article-issue-505
...
saving link form now sends ajax request, article view is now justified (issue #554 )
2014-03-13 20:57:22 +01:00
Maryana Rozhankivska
3ee27ee6ba
saving link form now sends ajax request, article view is now justified
2014-03-13 18:37:08 +02:00
Maryana Rozhankivska
6775da70a8
feature #505 - it is now possible to add link from bagged article (TODO: redev it to ajax action). Some enhancements to "save a link" popup div
2014-03-12 17:36:04 +02:00
Nicolas Lœuillet
f7382cd8c3
Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelinkform-conflict
...
fix of conflict of s shortcat and entering s in input fields
2014-03-12 12:55:48 +01:00
Maryana Rozhankivska
7339b0b08d
fix of conflict of s shortcat and entering s in input fields
2014-03-12 13:00:37 +02:00
Nicolas Lœuillet
1acd18510a
Merge pull request #544 from mariroz/feature-tags-autocomplete
...
a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477 , #542
2014-03-10 18:14:43 +01:00
Maryana Rozhankivska
fb26cc9375
a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477 , #542
2014-03-10 16:28:47 +02:00
Nicolas Lœuillet
d47a05a9a5
Merge pull request #535 from bobmaerten/clarify-import-process
...
Changed config section to clarify import process.
2014-03-10 13:14:26 +01:00
Nicolas Lœuillet
17b2afefad
[fix] test if user_id doesn't exist in feeds generation
2014-03-10 08:10:03 +01:00
Thomas LEBEAU
4744cb0e1d
bagit link + overlay save link + listmode
2014-03-08 13:47:15 +01:00
Bob Maerten
7c6aa8d826
Changed text to clarify import process.
2014-03-07 16:46:46 +01:00
