]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
9 years agoMerge branch 'dev' 1.8.0
Nicolas Lœuillet [Fri, 10 Oct 2014 11:33:54 +0000 (13:33 +0200)] 
Merge branch 'dev'

9 years agoMerge branch 'master' into dev
Nicolas Lœuillet [Fri, 10 Oct 2014 11:33:36 +0000 (13:33 +0200)] 
Merge branch 'master' into dev

Conflicts:
index.php

9 years agoMerge pull request #860 from wallabag/compatibility_file 863/head
Thomas Citharel [Wed, 8 Oct 2014 19:36:51 +0000 (21:36 +0200)] 
Merge pull request #860 from wallabag/compatibility_file

Move compatibility file (fixes #858)

9 years agoRight redirect from the new path 860/head
tcit [Wed, 8 Oct 2014 19:35:21 +0000 (21:35 +0200)] 
Right redirect from the new path

9 years agoMerge pull request #861 from wallabag/fix-query-sqlite-install
Thomas Citharel [Wed, 8 Oct 2014 19:32:03 +0000 (21:32 +0200)] 
Merge pull request #861 from wallabag/fix-query-sqlite-install

query for populate mysql/postgres was called when we choosed sqlite

9 years agoquery for populate mysql/postgres was called when we choosed sqlite 861/head
Nicolas Lœuillet [Wed, 8 Oct 2014 19:23:34 +0000 (21:23 +0200)] 
query for populate mysql/postgres was called when we choosed sqlite

9 years agochange href in install/index.php
Nicolas Lœuillet [Wed, 8 Oct 2014 19:11:56 +0000 (21:11 +0200)] 
change href in install/index.php

9 years agoFixes #858: move compatibility file into install folder
Nicolas Lœuillet [Wed, 8 Oct 2014 19:08:21 +0000 (21:08 +0200)] 
Fixes #858: move compatibility file into install folder

9 years agoMerge pull request #787 from wallabag/data-for-mysql
Thomas Citharel [Wed, 8 Oct 2014 17:32:39 +0000 (19:32 +0200)] 
Merge pull request #787 from wallabag/data-for-mysql

Add data for mysql installation, see #624

9 years agoFix bug for #787 787/head
tcit [Wed, 8 Oct 2014 17:31:15 +0000 (19:31 +0200)] 
Fix bug for #787

9 years agoMerge branch 'dev' into data-for-mysql
tcit [Wed, 8 Oct 2014 17:26:26 +0000 (19:26 +0200)] 
Merge branch 'dev' into data-for-mysql

9 years agoMerge pull request #855 from wallabag/fix-828
Nicolas Lœuillet [Sat, 4 Oct 2014 19:27:05 +0000 (21:27 +0200)] 
Merge pull request #855 from wallabag/fix-828

Fix #828

9 years agoMerge pull request #856 from wallabag/fix-826
Nicolas Lœuillet [Sat, 4 Oct 2014 18:34:40 +0000 (20:34 +0200)] 
Merge pull request #856 from wallabag/fix-826

Fix #826

9 years agoget content 856/head
tcit [Sat, 4 Oct 2014 18:17:00 +0000 (20:17 +0200)] 
get content

9 years agoMerge pull request #854 from wallabag/saveclick2search
Nicolas Lœuillet [Sat, 4 Oct 2014 18:13:10 +0000 (20:13 +0200)] 
Merge pull request #854 from wallabag/saveclick2search

Saveclick2search (fix for #831)

9 years agoget full content 855/head
tcit [Sat, 4 Oct 2014 17:45:02 +0000 (19:45 +0200)] 
get full content

9 years agosmall fix for better width for search translations full display 854/head
tcit [Sat, 4 Oct 2014 17:08:56 +0000 (19:08 +0200)] 
small fix for better width for search translations full display

9 years agotranslate search messages
tcit [Sat, 4 Oct 2014 17:01:43 +0000 (19:01 +0200)] 
translate search messages

9 years agoautofocus on all themes
tcit [Sat, 4 Oct 2014 16:51:43 +0000 (18:51 +0200)] 
autofocus on all themes

9 years agoMerge branch 'dev' into saveclick2search
tcit [Sat, 4 Oct 2014 16:47:56 +0000 (18:47 +0200)] 
Merge branch 'dev' into saveclick2search

9 years agofixed bug in config screen for default theme
tcit [Sat, 4 Oct 2014 16:45:43 +0000 (18:45 +0200)] 
fixed bug in config screen for default theme

9 years agosearch field selected
tcit [Sat, 4 Oct 2014 16:44:18 +0000 (18:44 +0200)] 
search field selected

9 years agoMerge pull request #853 from wallabag/fix-for-#797
Thomas Citharel [Sat, 4 Oct 2014 15:50:01 +0000 (17:50 +0200)] 
Merge pull request #853 from wallabag/fix-for-#797

Fix for #797

9 years agofix for #758
tcit [Sun, 28 Sep 2014 17:12:28 +0000 (19:12 +0200)] 
fix for #758

9 years agoMerge branch 'issue-844' of https://github.com/rros/wallabag into dev
tcit [Sun, 28 Sep 2014 15:48:06 +0000 (17:48 +0200)] 
Merge branch 'issue-844' of https://github.com/rros/wallabag into dev

9 years agoMerge branch 'dev' of https://github.com/wallabag/wallabag into dev
tcit [Sun, 28 Sep 2014 15:32:50 +0000 (17:32 +0200)] 
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

9 years agoget up to date for merge
tcit [Sun, 28 Sep 2014 15:31:02 +0000 (17:31 +0200)] 
get up to date for merge

9 years agoMerge pull request #802 from tcitworld/traductionfix
Thomas Citharel [Sun, 28 Sep 2014 15:25:40 +0000 (17:25 +0200)] 
Merge pull request #802 from tcitworld/traductionfix

Traductionfix

9 years agoMerge pull request #841 from wallabag/fixGDdetection
tcitworld [Sat, 27 Sep 2014 16:13:35 +0000 (18:13 +0200)] 
Merge pull request #841 from wallabag/fixGDdetection

Fix #766 - GD detection

9 years agoMerge branch 'refactor' into dev
tcit [Sat, 27 Sep 2014 15:54:24 +0000 (17:54 +0200)] 
Merge branch 'refactor' into dev

9 years agomerge refactor and dev
tcit [Sat, 27 Sep 2014 15:54:13 +0000 (17:54 +0200)] 
merge refactor and dev

9 years agoFix the PostgreSQL install errors 845/head
Robert Ros [Sat, 20 Sep 2014 14:38:41 +0000 (16:38 +0200)] 
Fix the PostgreSQL install errors

9 years agoFix #766 - GD detection 841/head
Thomas Citharel [Wed, 17 Sep 2014 14:36:10 +0000 (16:36 +0200)] 
Fix #766 - GD detection

9 years agoMerge pull request #839 from wallabag/fixlocalpictures
Nicolas Lœuillet [Tue, 16 Sep 2014 19:18:41 +0000 (21:18 +0200)] 
Merge pull request #839 from wallabag/fixlocalpictures

fix pictures display when DOWNLOAD_PICTURES is enabled

9 years agofix pictures display when DOWNLOAD_PICTURES is enabled 839/head
Thomas Citharel [Tue, 16 Sep 2014 18:27:03 +0000 (20:27 +0200)] 
fix pictures display when DOWNLOAD_PICTURES is enabled

9 years agoMerge pull request #836 from akoenig/x-forwarded-port
Nicolas Lœuillet [Tue, 16 Sep 2014 18:09:58 +0000 (20:09 +0200)] 
Merge pull request #836 from akoenig/x-forwarded-port

Implemented additional check for using the 'X-Forwarded-Port' header.

9 years agoMerge pull request #771 from tcitworld/refactor 851/head
Nicolas Lœuillet [Tue, 16 Sep 2014 13:21:12 +0000 (15:21 +0200)] 
Merge pull request #771 from tcitworld/refactor

fixed bug for epub export #755 ; also better metadata title

9 years agoImplemented additional check for using the 'X-Forwarded-Port' header. 836/head
André König [Thu, 11 Sep 2014 11:17:19 +0000 (13:17 +0200)] 
Implemented additional check for using the 'X-Forwarded-Port' header.

9 years agoMerge pull request #819 from wallabag/fixSQLiteDownloadDB
tcitworld [Wed, 10 Sep 2014 18:05:07 +0000 (20:05 +0200)] 
Merge pull request #819 from wallabag/fixSQLiteDownloadDB

Fix downloading SQLite database from all users

9 years agoMerge pull request #816 from zinnober/dev
Nicolas Lœuillet [Wed, 3 Sep 2014 11:14:29 +0000 (13:14 +0200)] 
Merge pull request #816 from zinnober/dev

Complete rework of faz.net-template

9 years agoremove old function 819/head
Thomas Citharel [Thu, 28 Aug 2014 19:01:43 +0000 (21:01 +0200)] 
remove old function

9 years agoFix downloading SQLite database from all users
Thomas Citharel [Tue, 26 Aug 2014 10:43:56 +0000 (12:43 +0200)] 
Fix downloading SQLite database from all users

9 years agoComplete rework of faz.net-template adding multipage support and major article cleanup 816/head
zinnober [Sat, 23 Aug 2014 14:47:29 +0000 (16:47 +0200)] 
Complete rework of faz.net-template adding multipage support and major article cleanup

9 years agoadded moreQueries for postgressql
Maryana Rozhankivska [Thu, 21 Aug 2014 16:07:19 +0000 (19:07 +0300)] 
added moreQueries for postgressql

9 years agoMerge branch 'dev' of https://github.com/wallabag/wallabag into dev
Thomas Citharel [Thu, 21 Aug 2014 14:42:22 +0000 (16:42 +0200)] 
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

9 years agoMerge pull request #814 from wallabag/fix-issue813
tcitworld [Thu, 21 Aug 2014 14:28:16 +0000 (16:28 +0200)] 
Merge pull request #814 from wallabag/fix-issue813

vendor dir is not accessible before install, sqlite db dir write check moved into db class

9 years agoMerge branch 'dev' of https://github.com/wallabag/wallabag into dev
Thomas Citharel [Thu, 21 Aug 2014 14:24:13 +0000 (16:24 +0200)] 
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

9 years agovendor dir is not accessible before install, sqlite db dir write check moved into... 814/head
Maryana Rozhankivska [Thu, 21 Aug 2014 14:17:36 +0000 (17:17 +0300)] 
vendor dir is not accessible before install, sqlite db dir write check moved into db class

9 years agoMerge pull request #783 from wallabag/message-after-login
Nicolas Lœuillet [Mon, 18 Aug 2014 12:41:09 +0000 (14:41 +0200)] 
Merge pull request #783 from wallabag/message-after-login

#763 fix to display the login successful message with the translation

9 years agoMerge pull request #784 from wallabag/fix-successful-add-message
Nicolas Lœuillet [Mon, 18 Aug 2014 12:40:54 +0000 (14:40 +0200)] 
Merge pull request #784 from wallabag/fix-successful-add-message

fix display of 'Done' message when we add a link from 'save a link' item

9 years agoMerge pull request #785 from wallabag/change-default-pagination
Nicolas Lœuillet [Mon, 18 Aug 2014 12:40:17 +0000 (14:40 +0200)] 
Merge pull request #785 from wallabag/change-default-pagination

change default pagination, set it to 12, to have a nice baggy display

9 years agomerge fix 776
Thomas Citharel [Fri, 15 Aug 2014 22:54:46 +0000 (00:54 +0200)] 
merge fix 776

9 years agominimum of control on server side added 782/head
Maryana Rozhankivska [Fri, 15 Aug 2014 16:22:55 +0000 (19:22 +0300)] 
minimum of control on server side added

9 years agoFix for #797 853/head
tcitworld [Tue, 5 Aug 2014 20:19:46 +0000 (22:19 +0200)] 
Fix for #797

9 years agoImproved instructions 802/head
tcit [Sun, 3 Aug 2014 16:17:43 +0000 (18:17 +0200)] 
Improved instructions

9 years agolittle fix 808/head
tcit [Tue, 29 Jul 2014 20:18:15 +0000 (22:18 +0200)] 
little fix

9 years agochanges in all themes
tcit [Sat, 26 Jul 2014 10:44:55 +0000 (12:44 +0200)] 
changes in all themes

9 years agoTranslations
tcit [Sat, 26 Jul 2014 10:42:48 +0000 (12:42 +0200)] 
Translations

9 years agoprecision
tcit [Fri, 25 Jul 2014 06:42:30 +0000 (08:42 +0200)] 
precision

9 years agoadded email field
tcit [Fri, 25 Jul 2014 06:42:03 +0000 (08:42 +0200)] 
added email field

9 years agolink to guidelines in contributing file
Nicolas Lœuillet [Fri, 25 Jul 2014 05:52:00 +0000 (07:52 +0200)] 
link to guidelines in contributing file

9 years agothank you @mariroz & @tcitworld :)
Nicolas Lœuillet [Fri, 25 Jul 2014 05:50:56 +0000 (07:50 +0200)] 
thank you @mariroz & @tcitworld :)

9 years agoguidelines for wallabag
Nicolas Lœuillet [Fri, 25 Jul 2014 05:50:15 +0000 (07:50 +0200)] 
guidelines for wallabag

9 years agoMerge branch 'fix/securityAllowedActions' into dev
Nicolas Lœuillet [Fri, 25 Jul 2014 05:27:21 +0000 (07:27 +0200)] 
Merge branch 'fix/securityAllowedActions' into dev

9 years agotypo
Nicolas Lœuillet [Fri, 25 Jul 2014 05:26:56 +0000 (07:26 +0200)] 
typo

9 years agoMerge branch 'fix/securityMaster' 1.7.2
Nicolas Lœuillet [Thu, 24 Jul 2014 19:41:16 +0000 (21:41 +0200)] 
Merge branch 'fix/securityMaster'

9 years ago1.7.2
Nicolas Lœuillet [Thu, 24 Jul 2014 19:41:01 +0000 (21:41 +0200)] 
1.7.2

9 years agosecurity fix 791/head
Maryana Rozhankivska [Thu, 24 Jul 2014 14:47:23 +0000 (17:47 +0300)] 
security fix

9 years agosecurity issue 790/head
Maryana Rozhankivska [Thu, 24 Jul 2014 13:48:41 +0000 (16:48 +0300)] 
security issue

9 years agoMerge branch 'dev' of github.com:wallabag/wallabag into dev
Nicolas Lœuillet [Wed, 23 Jul 2014 11:45:07 +0000 (13:45 +0200)] 
Merge branch 'dev' of github.com:wallabag/wallabag into dev

9 years agoMerge branch 'refactor' into dev
Nicolas Lœuillet [Wed, 23 Jul 2014 11:44:48 +0000 (13:44 +0200)] 
Merge branch 'refactor' into dev

9 years agoMerge branch 'dev' into refactor
Nicolas Lœuillet [Wed, 23 Jul 2014 11:42:30 +0000 (13:42 +0200)] 
Merge branch 'dev' into refactor

Conflicts:
check_setup.php
index.php

9 years agoMerge pull request #789 from wallabag/feature/someMoreSitesConfig
Nicolas Lœuillet [Wed, 23 Jul 2014 11:38:21 +0000 (13:38 +0200)] 
Merge pull request #789 from wallabag/feature/someMoreSitesConfig

config for habrahabr.ru to grab articles with comments

9 years agoremoved permissions test on htmlpurifier 768/head
Nicolas Lœuillet [Wed, 23 Jul 2014 11:35:19 +0000 (13:35 +0200)] 
removed permissions test on htmlpurifier

9 years agoconfig for habrahabr.ru to grep articles with comments 789/head
Maryana Rozhankivska [Wed, 23 Jul 2014 11:27:57 +0000 (14:27 +0300)] 
config for habrahabr.ru to grep articles with comments

9 years agoAdd data for mysql installation, see #624
Nicolas Lœuillet [Tue, 22 Jul 2014 19:48:21 +0000 (21:48 +0200)] 
Add data for mysql installation, see #624

9 years agoMerge branch 'anno1337-dev' into dev
Nicolas Lœuillet [Tue, 22 Jul 2014 19:45:21 +0000 (21:45 +0200)] 
Merge branch 'anno1337-dev' into dev

9 years agoMerge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev
Nicolas Lœuillet [Tue, 22 Jul 2014 19:26:02 +0000 (21:26 +0200)] 
Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev

9 years agoMerge branch 'feature/programmingCodeSyntaxHighlighting' into dev
Nicolas Lœuillet [Tue, 22 Jul 2014 17:33:34 +0000 (19:33 +0200)] 
Merge branch 'feature/programmingCodeSyntaxHighlighting' into dev

9 years agoMerge branch 'dev' into feature/programmingCodeSyntaxHighlighting
Nicolas Lœuillet [Tue, 22 Jul 2014 17:32:24 +0000 (19:32 +0200)] 
Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting

9 years agohighlight.js library added to highlight programming code examples in article view 786/head
Maryana Rozhankivska [Tue, 22 Jul 2014 17:17:15 +0000 (20:17 +0300)] 
highlight.js library added to highlight programming code examples in article view

9 years agochange default pagination, set it to 12, to have a nice baggy display 785/head
Nicolas Lœuillet [Tue, 22 Jul 2014 16:14:41 +0000 (18:14 +0200)] 
change default pagination, set it to 12, to have a nice baggy display

9 years agofix display of 'Done' message when we add a link from 'save a link' item 784/head
Nicolas Lœuillet [Tue, 22 Jul 2014 16:12:03 +0000 (18:12 +0200)] 
fix display of 'Done' message when we add a link from 'save a link' item

9 years agofix to display the login successful message with the translation 783/head
Nicolas Lœuillet [Tue, 22 Jul 2014 16:01:27 +0000 (18:01 +0200)] 
fix to display the login successful message with the translation

9 years agoFix #776
Nicolas Lœuillet [Tue, 22 Jul 2014 14:37:13 +0000 (16:37 +0200)] 
Fix #776

9 years agoSplit up check_setup.php into two files. The new file check_essentials.php takes... 780/head
Marc Wilhelm [Tue, 22 Jul 2014 09:52:18 +0000 (11:52 +0200)] 
Split up check_setup.php into two files. The new file check_essentials.php takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773

9 years agoMerge pull request #775 from wallabag/feature/someMoreSitesConfig
Nicolas Lœuillet [Mon, 21 Jul 2014 19:31:45 +0000 (21:31 +0200)] 
Merge pull request #775 from wallabag/feature/someMoreSitesConfig

issue #750 - config for dn.pt site added

9 years agoMerge branch 'skibbipl-dev' into dev
Nicolas Lœuillet [Mon, 21 Jul 2014 19:22:34 +0000 (21:22 +0200)] 
Merge branch 'skibbipl-dev' into dev

9 years agoMerge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev
Nicolas Lœuillet [Mon, 21 Jul 2014 19:21:55 +0000 (21:21 +0200)] 
Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev

Conflicts:
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po

9 years agoUpdated polish translation 777/head
skibbipl [Mon, 21 Jul 2014 18:58:58 +0000 (20:58 +0200)] 
Updated polish translation

9 years agoissue #750 - config for dn.pt site added 775/head
Maryana Rozhankivska [Mon, 21 Jul 2014 16:34:59 +0000 (19:34 +0300)] 
issue #750 - config for dn.pt site added

9 years agofixed bug for epub export #755 ; also better metadata title 771/head
tcit [Sat, 19 Jul 2014 22:45:45 +0000 (00:45 +0200)] 
fixed bug for epub export #755 ; also better metadata title

9 years agoMerge branch 'refactor' of github.com:wallabag/wallabag into refactor
Nicolas Lœuillet [Fri, 18 Jul 2014 09:29:05 +0000 (11:29 +0200)] 
Merge branch 'refactor' of github.com:wallabag/wallabag into refactor

9 years agoremove .idea in gitignore
Nicolas Lœuillet [Fri, 18 Jul 2014 09:28:49 +0000 (11:28 +0200)] 
remove .idea in gitignore

9 years agoMerge pull request #764 from tcitworld/refactor
Nicolas Lœuillet [Thu, 17 Jul 2014 14:06:53 +0000 (16:06 +0200)] 
Merge pull request #764 from tcitworld/refactor

Refactor Flattr class.

9 years agocamelCase for FlattrItem class (following) 764/head
tcitworld [Thu, 17 Jul 2014 13:42:59 +0000 (15:42 +0200)] 
camelCase for FlattrItem class (following)

9 years agocamelCase for FlattrItem class
tcitworld [Thu, 17 Jul 2014 13:34:55 +0000 (15:34 +0200)] 
camelCase for FlattrItem class

9 years agoMerge pull request #761 from wallabag/dev 1.7.1
Nicolas Lœuillet [Tue, 15 Jul 2014 09:49:24 +0000 (11:49 +0200)] 
Merge pull request #761 from wallabag/dev

1.7.1

9 years agoupdated specific configuration for parsing
Nicolas Lœuillet [Sun, 13 Jul 2014 08:15:40 +0000 (10:15 +0200)] 
updated specific configuration for parsing

9 years ago#584 check permissions for HTMLPurifier/DefinitionCache/Serializer folder
Nicolas Lœuillet [Sat, 12 Jul 2014 20:08:48 +0000 (22:08 +0200)] 
#584 check permissions for HTMLPurifier/DefinitionCache/Serializer folder