1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 16:35:35 +02:00
Commit Graph

118 Commits

Author SHA1 Message Date
772494af7e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
2013-08-16 18:04:52 +02:00
48f6f4559c [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.

PHPBB3-11794
2013-08-16 17:48:36 +02:00
0ef95a7009 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php
2013-07-13 13:16:58 -04:00
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com
PHPBB3-11112
2013-07-12 16:24:27 -04:00
a97d9d4b89 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
2013-05-06 22:11:33 +02:00
841f1e4922 Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympus
* MGaetan89/ticket/11144:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable
2013-05-06 21:56:20 +02:00
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
2013-05-06 21:31:16 +02:00
1dea12d607 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11517] Fix list numbering
2013-05-02 23:13:27 +02:00
6d4a75b3cb [ticket/11517] Fix list numbering
PHPBB3-11517
2013-05-02 06:29:32 +05:30
a89ed49cbf [ticket/11287] Add template event naming to docs/coding-guidelines.html
PHPBB3-11287
2012-12-20 16:40:53 -05:00
b67f112e03 [ticket/10091] Bump minimum supported postgresql version to 8.3.
PHPBB3-10091
2012-12-04 02:52:18 -05:00
7d7dc98b10 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
PHPBB3-11181
2012-11-09 23:16:42 +01:00
22cc7c73fd [ticket/10855] Fixed a couple issues in coding guidelines.
PHPBB3-10855
2012-05-22 19:38:30 +01:00
06efa6c0be [ticket/10855] Added JS camelCaps info to guidelines.
PHPBB3-10855
2012-05-03 22:34:35 +01:00
ee2e2cb2c3 [ticket/10855] Added array trailing commas info in js to guidelines.
PHPBB3-10855
2012-05-03 22:30:22 +01:00
3978e2620e [ticket/10855] Modified coding guidelines to reflect JS brace changes.
Braces always go on the same line in JavaScript.

PHPBB3-10855
2012-04-29 19:07:48 +01:00
0858a8023b [ticket/10161] added fullstop to the end of sentence
PHPBB3-10161
2012-04-26 09:20:33 +02:00
02cc32b901 [ticket/10161] coding-guidelines.html updated
PHPBB3-10161
2012-04-26 09:19:51 +02:00
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_*
PHPBB-10609
2012-03-31 18:14:07 +02:00
e13e4d9206 [feature/merging-style-components] Updating styles in coding guidelines
Updating styles section in coding guidelines

PHPBB3-10632
2012-03-31 16:33:30 +03:00
ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components
* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  ...

Conflicts:
	phpBB/install/database_update.php
2012-03-29 22:38:07 +03:00
063f6893af [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
PHPBB3-10693
2012-03-25 21:20:52 -04:00
68336ab137 [feature/merging-style-components] Updating coding guidelines
Updating template inheritance section in coding guidelines

PHPBB3-10632
2012-03-14 23:25:07 +02:00
a01e916737 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php
2012-01-02 17:36:21 +01:00
0fc37fb397 [ticket/9916] Changing coding guidelines license
PHPBB3-9916
2012-01-02 16:20:22 +00:00
b05c325dd2 [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places
PHPBB3-10524
2011-12-12 20:23:20 +00:00
acd72fad7b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10430] Fix typos/etc in coding guidelines
2011-10-29 12:22:17 +02:00
8b99f04943 [ticket/10430] Fix typos/etc in coding guidelines
Mainly minor changes to correct errors and improve readability.

* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all

PHPBB3-10430
2011-10-28 10:27:38 -04:00
8c7be51bcc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10246] Move coding guidelines VCS section to wiki
2011-10-13 18:30:08 +02:00
75ef0fde82 [ticket/10246] Move coding guidelines VCS section to wiki
The VCS section can now be found at:
* http://wiki.phpbb.com/Git#Branches

PHPBB3-10246
2011-10-13 17:43:59 +02:00
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
2011-09-05 06:03:19 -04:00
ddbad5551d Merge remote-tracking branch 'github-igorw/ticket/10258' into develop
* github-igorw/ticket/10258:
  [ticket/10258] Remove the meta charset tag
  [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
  [ticket/10258] Remove copyright meta tag from docs
  [ticket/10258] Remove resource-type and distribution meta tags
  [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
  [ticket/10258] Change the DOCTYPE to HTML5
2011-07-20 09:21:16 -04:00
b98fca54b0 [ticket/10155] Briefly explain assets in coding-guidelines
PHPBB3-10155
2011-07-17 10:55:08 +02:00
541a7db101 [ticket/7090] Update documented minimum PHP version to 5.2.0
PHPBB3-7090
2011-07-13 13:02:37 +02:00
c945fc9355 [ticket/10155] Add jQuery, introduce global assets path
Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
2011-07-11 10:00:30 +02:00
af1c8747ce [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
PHPBB3-10258
2011-07-11 00:39:19 +02:00
f5947439b2 [ticket/10258] Remove copyright meta tag from docs
It fails HTML5 validation and we already have a 'copyright and
disclaimer' section in all of those documents. We can always represent
the copyright more semantically later (such as the HTML5 <copyright>
tag).

PHPBB3-10258
2011-07-11 00:27:10 +02:00
70a904335f [ticket/10258] Remove resource-type and distribution meta tags
They break HTML5 validation.

PHPBB3-10258
2011-07-10 23:13:25 +02:00
854c14f9f6 [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
These meta tags are IE specific and do not validate as HTML5.

PHPBB3-10258
2011-07-10 23:04:14 +02:00
766537035e [ticket/10258] Change the DOCTYPE to HTML5
PHPBB3-10258
2011-07-09 17:04:46 +02:00
9891f5a8d2 [ticket/10110] Enable the serialization and add a constant for
defined the database

PHPBB3-10110
2011-03-31 20:16:53 +02:00
fad7333e72 [ticket/10110] Add Redis ACM backend
PHPBB3-10110
2011-03-31 20:16:52 +02:00
36e96bbc6a [ticket/10059] Fix two misspellings of consistent.
PHPBB3-10059
2011-03-01 19:53:12 -05:00
60eff4e59a [ticket/9859] Remove the years from the copyright statements in docs files.
PHPBB3-9859
2011-01-16 18:50:53 +01:00
180e97abdc [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
PHPBB3-9859
2011-01-16 18:50:11 +01:00
859149f5c3 [ticket/9509] Fix a typo and wrong period placement
Thanks to Michael C. for spotting this.

PHPBB3-9509
2010-11-18 13:55:39 +01:00
d503272645 Merge branch 'ticket/bantu/9857' into develop-olympus
* ticket/bantu/9857:
  [ticket/9857] Remove visible $Id$ from phpBB/docs files.
2010-10-19 14:03:44 +02:00
c4dfe24fec [ticket/9509] Remove section 8 from index
Thanks Andreas.

PHPBB3-9509
2010-10-19 13:52:00 +02:00
5ad5930c8f [ticket/9509] Close anchor tag in coding guidelines
Thanks Andreas.

PHPBB3-9509
2010-10-19 13:45:50 +02:00
b27b69cf37 [ticket/9857] Remove visible $Id$ from phpBB/docs files.
PHPBB3-9857
2010-10-19 12:22:07 +02:00