Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
08111d3
Use safe_ instead mysqli_ functions
makss Dec 6, 2016
3e5bdb2
Introduce default_prefs
makss Dec 6, 2016
c5f44fc
frefs fix
makss Dec 6, 2016
8954e6a
check_prefs_integrity
makss Dec 6, 2016
88b71b1
LANG fix
makss Dec 6, 2016
db42354
safe_insert
makss Dec 6, 2016
f4643d2
$dbversion
makss Dec 6, 2016
da047ce
Remove not used $DB
makss Dec 6, 2016
c3647ea
doSlash bulk insert prefs
makss Dec 7, 2016
6d36df2
Use get_pref, set_pref
makss Dec 7, 2016
ff71d30
Introduce /textpattern/update/structure/ folder
makss Dec 7, 2016
9a8b9e1
Introduce get_files_content()
makss Dec 7, 2016
e8fb8ea
Introduce *.data files
makss Dec 7, 2016
58dffd6
Change format default_prefs
makss Dec 8, 2016
8ebf019
Use create_user() in setup
makss Dec 8, 2016
d083b4a
permlink_mode check
makss Dec 8, 2016
7017336
Reorder txpsql.php
makss Dec 8, 2016
f5fbec5
Article moved to /articles folder
makss Dec 8, 2016
90fd40a
Minor fixes
makss Dec 8, 2016
f5e7c36
psr2
makss Dec 8, 2016
93233c4
articles.xml
makss Dec 14, 2016
bd01922
Move comments to xml
makss Dec 14, 2016
423b593
Prepare json data
makss Dec 14, 2016
db3f342
Merge branch 'dev' into patch-8
philwareham Dec 14, 2016
40a97c5
Move sql data to json
makss Dec 14, 2016
dcb4dd9
Modify article insert
makss Dec 14, 2016
ab9bb33
Added optional fields for articles.xml
makss Dec 15, 2016
67cafee
Num to STATUS_LIVE
makss Dec 15, 2016
1366898
Move core prefs to JSON
makss Dec 15, 2016
974d76d
Pref version fix
makss Dec 15, 2016
1250c2f
AutoCreate core private prefs
makss Dec 16, 2016
69e77fa
Minor fix default core.prefs
makss Dec 16, 2016
5a65aff
Introduce Theme prefs
makss Dec 16, 2016
0086d08
Fix Theme prefs
makss Dec 16, 2016
96b67ae
Complete AutoFix core/theme prefs
makss Dec 26, 2016
8a32d9b
Autodetect LANG
makss Dec 26, 2016
f017606
Remove insert/update prefs from /update/ folder
makss Dec 27, 2016
e4c0122
Fix pref['default_section']
makss Dec 27, 2016
e6c6c36
Drop the prefs_id column in txp_prefs
makss Dec 27, 2016
3eabb7c
Merge branch 'dev' into patch-8
makss Dec 27, 2016
7ee40d0
Introduce article_import() function
makss Dec 27, 2016
d91e112
Move article_import() from setup dir
makss Dec 27, 2016
efe171d
Introduce get_prefs_theme()
makss Dec 28, 2016
f927f65
Revert: Move article_import() from setup dir
makss Dec 28, 2016
1a56b87
Merge pull request #7 from textpattern/dev
makss Jan 25, 2017
bf9d449
Do not create private prefs during setup
makss Jan 25, 2017
aede51e
Use lang/*.txt files in setup.
makss Jan 25, 2017
8c3462e
Set blog_uid variable
makss Jan 26, 2017
d76a2ca
Use Textpack parser for install lang/*.txt files
makss Jan 26, 2017
dc066a4
Need global $txp_groups for create_user
makss Jan 26, 2017
b5425ae
Move install_language_from_file() to txplib_misc.php
makss Jan 26, 2017
3a39b65
Merge pull request #8 from textpattern/dev
makss Jan 26, 2017
a598a37
Minor revert and use l10n language class
makss Jan 26, 2017
b705d9d
Fix NULL date in textpack
makss Jan 26, 2017
1a6ceb0
Prepare xml data
makss Jan 27, 2017
baaba6b
Introduce import_txp_xml()
makss Jan 28, 2017
9f8e2ba
Bit code simplification
makss Jan 28, 2017
6264af1
Introduce DB/Core class
makss Jan 29, 2017
f2a92ad
Move Core prefs to class
makss Jan 29, 2017
0e82c09
fix
makss Jan 29, 2017
aa64ee6
Introduce Import/TxpXML class
makss Jan 30, 2017
0420419
Move article_import() to class
makss Jan 30, 2017
ad662d9
Merge pull request #9 from makss/OOP-probe
makss Jan 30, 2017
d4b7557
Fix getStructure function
makss Jan 30, 2017
aca9021
Merge pull request #10 from textpattern/dev
makss Jan 30, 2017
9860b18
Allow import css, form, page via xml. Example import file.
makss Jan 30, 2017
33a3a1f
Merge pull request #11 from textpattern/dev
makss Jan 31, 2017
755d07d
Breadcrumb and category list enhancement
bloatware Feb 5, 2017
4f58af1
Merge branch 'dev' of https://github.com/textpattern/textpattern into…
bloatware Feb 5, 2017
5bee455
Cache breadcrumb queries
bloatware Feb 5, 2017
6e0901b
Writing history
philwareham Feb 6, 2017
f6b9921
Update zxcvbn to v4.4.2
philwareham Feb 7, 2017
7c58854
Nested category lists and <txp:this /> tag
bloatware Feb 10, 2017
c49911f
file panel – date sort in file list
jools-r Feb 11, 2017
d084a84
Merge pull request #12 from textpattern/dev
makss Feb 12, 2017
bbb649f
Update history
philwareham Feb 7, 2017
1eb737f
Merge pull request #884 from jools-r/dev
philwareham Feb 13, 2017
252c667
More backward-compatible category_list
bloatware Feb 20, 2017
8ad4af9
Honor categories attribute
bloatware Feb 21, 2017
7c5d2e6
New forum domain
philwareham Feb 23, 2017
9fa94f2
Docs site uses HTTPS protocol now
philwareham Feb 23, 2017
a96ad1c
Missed one
philwareham Feb 23, 2017
d041dd0
Some prep work for planned domain move
philwareham Feb 24, 2017
00d3b40
Few more URL changes
philwareham Feb 24, 2017
311e70d
This is evaluate
bloatware Feb 24, 2017
8b9def1
Too static attributes
bloatware Feb 24, 2017
b844c90
New domain
bloatware Feb 24, 2017
1a6cef1
Consistency
philwareham Feb 25, 2017
d1b7e4a
Limit vertical height of fullsize images
philwareham Feb 27, 2017
4626104
urldecode image alt and caption in tagbuilder
bloatware Feb 27, 2017
2c1d23b
Merge
makss Feb 27, 2017
2196350
Revert "Merge"
makss Feb 27, 2017
028b5b1
Merge branch 'dev' of https://github.com/textpattern/textpattern into…
zmonteiro Feb 27, 2017
055aeb7
Merge branch 'textpattern-dev' into patch-8
zmonteiro Feb 27, 2017
5fd5a5a
New domain
makss Feb 27, 2017
433e16d
AutoDelete old prefs
makss Feb 28, 2017
55d0576
Support AutoDelete old global/private prefs
makss Feb 28, 2017
1c933bf
Introduce createTable()
makss Feb 28, 2017
ef19100
Expose the number of pages
bloatware Mar 3, 2017
90c121a
Add missing 4.6.0 history
Bloke Mar 5, 2017
be7b3c1
Tidying pretext, round one
bloatware Mar 6, 2017
4aa9fc3
Reworked imageFetchInfo() to include logic duplicated across image_da…
jsoo Mar 6, 2017
7b78ff3
image_author(): added id and name attributes
jsoo Mar 6, 2017
8af2767
Refactored image() and thumbnail() to use imageFetchInfo(). (NB: this…
jsoo Mar 6, 2017
25492ac
Merge branch 'dev' into image-tag-refactor
jsoo Mar 7, 2017
c9cbf1c
Deprecated image_display() and image_index(); use image() and images(…
jsoo Mar 7, 2017
3a85a3f
thumbnail(): deprecated the 'poplink' attribute.
jsoo Mar 7, 2017
a1fee93
After previous (c9cbf1c) commit, image_index() no longer needs to dec…
jsoo Mar 7, 2017
950b1c3
allow image_url() to temporarily change global; code cleaning in ima…
jsoo Mar 7, 2017
d11c165
Latest theme builds
philwareham Mar 7, 2017
e58f030
Custom headers
bloatware Mar 7, 2017
e85b137
Inverted rewrite
bloatware Mar 7, 2017
e5b45bb
Forms get cache
bloatware Mar 11, 2017
c131017
Remove examples and test data.
makss Mar 12, 2017
afbee19
Consistent width
philwareham Mar 13, 2017
196272c
Remove form cache
bloatware Mar 14, 2017
169ce19
Merge branch 'dev' into patch-8
makss Mar 14, 2017
d26a926
Merge branch 'makss-patch-8' into dev
Bloke Mar 16, 2017
07c3389
Merge pull request #885 from jsoo/image-tag-refactor
Bloke Mar 16, 2017
3a9830c
Recent URL changes in welcome article
philwareham Mar 16, 2017
187ae80
Different favicon to official Textpattern sites
philwareham Mar 16, 2017
beb10f9
Update jQuery to v3.2.0
philwareham Mar 17, 2017
ca65f1e
Fix RSS feed warning
makss Mar 19, 2017
74d597c
Formatting RSS output
makss Mar 19, 2017
d10cb59
Fix Atom feed
makss Mar 19, 2017
1830c59
Formatting Atom output
makss Mar 19, 2017
0929554
Don't show diagnostics textarea on setup/upgrade
Bloke Mar 20, 2017
e038ef5
jQuery v3.2.1
philwareham Mar 21, 2017
ac55310
Merge pull request #889 from makss/patch-7
bloatware Mar 21, 2017
0730171
Fix jQuery permissions?
philwareham Mar 21, 2017
11cbc1c
2 space indents in JSON format
philwareham Mar 22, 2017
e46b236
Move posting/modification date below title field
philwareham Mar 22, 2017
82222ea
Make textarea options UI more globally useful
philwareham Mar 23, 2017
d89b168
link_to_next|prev populate article data
bloatware Mar 23, 2017
78d8e07
Not worths doing
bloatware Mar 23, 2017
61841e3
Latest updates from Normalize v6
philwareham Mar 28, 2017
1c05e73
Move Categories to their own twisty block
Bloke Mar 29, 2017
69074d4
Minor amends from theme builds
philwareham Mar 29, 2017
e54e957
Initial pass at moving textfilters inline
Bloke Mar 30, 2017
0c1f24a
jQuery UI Tabs code simplification
philwareham Mar 30, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Changes in 4.7.0 (upcoming)
* Textile v3.6.
* Added: Pages, Forms and Styles panels save some changes without page refreshes
(Ajax). Last used Page/Form/Stylesheet remembered.
* Added: User selectable column list options in tables replaces 'Toggle details'
checkboxes. Settings remembered per device.
* Added: User selectable column list options in tables replaces 'Show more
detail' checkboxes. Settings remembered per device.
* Added: Valueless attributes.
* Added: Short tags.
* Added: <txp:evaluate /> tag.
Expand All @@ -16,6 +16,7 @@ Changes in 4.7.0 (upcoming)
* Added: One-click comment searches by parent article (thanks, makss).
* Changed: <txp:page_title /> tag SEO - site name renders after page name,
default separator changed from ': ' to ' | ', page numbers added.
* Changed: <txp:breadcrumb /> can be used as a container tag.
* Changed: Reinstate <txp:keywords> tag and add wraptag/class/break attributes.
* Changed: Upgrades land on Diagnostics panel, with suitable message.
* Changed: Enable HTTP 226 responses (thanks, da2x).
Expand All @@ -28,7 +29,7 @@ Changes in 4.7.0 (upcoming)
entirely at Textpattern 4.8.0).
* Changed: Extensive admin theme image optimizations.
* Fixed: Only update db version string if using release version.
* zxcvbn 4.4.1.
* zxcvbn 4.4.2.

Changes in 4.6.2

Expand Down Expand Up @@ -172,6 +173,7 @@ Changes in 4.6.0
* Developer: Refactored 'Validator', 'Constraint', and 'theme' classes into the
'Textpattern' namespace; deprecated their 'txplib_validator' and
'txplib_theme' implementations.
* Developer: Changed name of pref 'permalink_title_format' to 'permlink_format'.
* jQuery 1.12.4.
* jQuery UI 1.12.0.

Expand Down Expand Up @@ -263,7 +265,7 @@ Changes in 4.5.0
* Minimum system requirement: PHP 5.2.
* Modern default site theme (responsive, HTML5, CSS3).
* Choice of HTML5 or XHTML document type as a preference.
* Textile 2.4.1. See full changelog at http://textpattern.com/textile-changelog.
* Textile 2.4.1. See full changelog at https://textpattern.io/textile-changelog.
* User interface realignment and clean-up.
* Additional admin theme (Hive).
* Beautified setup process.
Expand Down Expand Up @@ -477,9 +479,9 @@ Changes in 4.2.0
gAtt(), and input() functions. These will be removed in next release.
* Developer: Plugins can flag their interest in lifecycle events (install,
uninstall, activate, deactivate). @see
http://svn.textpattern.com/development/4.x-plugin-template/.
https://github.com/textpattern/textpattern-plugin-template.
* Developer: Optional capability to jump to a plugin's options from the plugin
tab. @see http://svn.textpattern.com/development/4.x-plugin-template/.
tab. @see https://github.com/textpattern/textpattern-plugin-template.
* jQuery 1.3.2.

Changes in 4.1.0
Expand Down
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Textpattern CMS

[![Textpattern Logo](http://textpattern.com/assets/img/branding/carver/carver-128px.svg)](http://textpattern.com/)
[![Textpattern Logo](https://textpattern.io/assets/img/branding/carver/carver-128px.svg)](http://textpattern.com/)

**A flexible, elegant and easy-to-use content management system.**

Expand Down Expand Up @@ -52,7 +52,7 @@ for details on upgrading Textpattern.

## Help and support

The [Textpattern support forum](http://forum.textpattern.com) is home to
The [Textpattern support forum](https://forum.textpattern.io) is home to
a friendly and helpful community of Textpattern users and experts.
Textpattern also has social network presences on
[Twitter](http://textpattern.com/@textpattern),
Expand All @@ -61,11 +61,16 @@ Textpattern also has social network presences on

## Contributing

Want to help out with the development of Textpattern CMS? Please refer to the [Contributing documentation](http://docs.textpattern.io/development/contributing) for full details.
Want to help out with the development of Textpattern CMS? Please refer to the
[Contributing documentation](https://docs.textpattern.io/development/contributing)
for full details.

## GitHub topic tags

If you use GitHub for Textpattern-related development please consider adding some of the following [topic](https://help.github.com/articles/about-topics/) keywords to your public project repositories, so we can build a network of discoverable resources:
If you use GitHub for Textpattern-related development please consider adding
some of the following [topic](https://help.github.com/articles/about-topics/)
keywords to your public project repositories, so we can build a network of
discoverable resources:

* `textpattern`
* `textpattern-plugin`
Expand Down
16 changes: 8 additions & 8 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ system. Textpattern is both free and open source.

* The Textpattern FAQ is available at http://textpattern.com/faq/
* In-depth documentation and a comprehensive tag index is available in the
Textpattern user documentation at http://docs.textpattern.io
Textpattern user documentation at https://docs.textpattern.io
* You can get support and information via:
Forum: http://forum.textpattern.com/
Twitter: http://textpattern.com/@textpattern
Google+: http://textpattern.com/+
Facebook: http://textpattern.com/facebook
Forum: https://forum.textpattern.io/
Twitter: https://textpattern.io/@textpattern
Google+: https://textpattern.io/+
Facebook: https://textpattern.io/facebook


== Installation ==
Expand All @@ -38,7 +38,7 @@ system. Textpattern is both free and open source.
clients and IDEs have an option to show these hidden files. Otherwise, you can
temporarily show hidden files in OS X/macOS by using the Terminal.app - follow
these instructions:
http://textpattern.com/hidden-files-osx
https://textpattern.io/hidden-files-osx
* Create or verify the existence of a working MySQL database with valid username
and password. From Textpattern 4.6.0, the MySQL database user requires INDEX
permissions in addition to standard SELECT, CREATE, UPDATE, ALTER, etc
Expand Down Expand Up @@ -105,11 +105,11 @@ system. Textpattern is both free and open source.

* There are additional resources for the default front-side theme, such as
Sass preprocessor files, available at:
http://textpattern.com/default-theme/tree/master/
https://github.com/textpattern/textpattern-default-theme/tree/master/


== Contributing ==

Want to help out with the development of Textpattern CMS? Please refer to the
Contributing documentation http://docs.textpattern.io/development/contributing
Contributing documentation https://docs.textpattern.io/development/contributing
for full details.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"require-dev": {
"squizlabs/php_codesniffer": "2.*"
}
"require-dev": {
"squizlabs/php_codesniffer": "2.*"
}
}
4 changes: 2 additions & 2 deletions css.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

// Make sure we display all errors that occur during initialisation.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Textpattern CMS",
"description": "Textpattern is a flexible, elegant and easy-to-use CMS.",
"homepage": "http://textpattern.com",
"homepage": "https://textpattern.io",
"textpattern-version": {
"release": "4.6.2",
"prerelease": null
Expand Down
4 changes: 2 additions & 2 deletions rpc/TXP_RPCServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* XML-RPC Server for Textpattern 4.0.x
* http://web.archive.org/web/20150119065246/http://txp.kusor.com/rpc-api
Expand All @@ -22,7 +22,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

if (!defined('txpath')) {
Expand Down
4 changes: 2 additions & 2 deletions rpc/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* XML-RPC Server for Textpattern 4.0.x
* http://web.archive.org/web/20150119065246/http://txp.kusor.com/rpc-api
Expand All @@ -22,7 +22,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

// TODO: change error reporting to E_ALL, including E_NOTICE to detect subtle bugs?
Expand Down
4 changes: 2 additions & 2 deletions sites/site1/admin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

// Use buffering to ensure bogus whitespace is ignored.
Expand Down
4 changes: 2 additions & 2 deletions sites/site1/admin/setup/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

// Use buffering to ensure bogus whitespace is ignored.
Expand Down
6 changes: 3 additions & 3 deletions sites/site1/private/config-dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

/**
Expand Down Expand Up @@ -103,7 +103,7 @@

/*
* Optional, advanced: http address of the site serving images
* see http://forum.textpattern.com/viewtopic.php?id=34493
* see https://forum.textpattern.io/viewtopic.php?id=34493
*/

// define('ihu', 'http://static.example.com/');
4 changes: 2 additions & 2 deletions sites/site1/public/css.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

include '../private/config.php';
Expand Down
4 changes: 2 additions & 2 deletions sites/site1/public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
* Textpattern Content Management System
* http://textpattern.com
* https://textpattern.io/
*
* Copyright (C) 2017 The Textpattern Development Team
*
Expand All @@ -18,7 +18,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Textpattern. If not, see <http://www.gnu.org/licenses/>.
* along with Textpattern. If not, see <https://www.gnu.org/licenses/>.
*/

// Make sure we display all errors that occur during initialisation.
Expand Down
Loading