makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 12:18:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
16058 commits 18 branches 192 tags 207 MiB
Commit graph

16058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
51f8f642de Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
 2011-12-16 18:08:08 +01:00
Andreas Fischer
ba576f823b [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release. 2011-12-16 18:03:46 +01:00
Andreas Fischer
d42d097244 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485

Conflicts:
	phpBB/styles/prosilver/template/forumlist_body.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
 2011-12-16 17:51:48 +01:00
Andreas Fischer
74c4b92760 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
 2011-12-16 17:45:08 +01:00
Andreas Fischer
6bfca76f1c Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3.0.10 
* nickvergessen/ticket/10504:
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
 2011-12-16 17:44:57 +01:00
Andreas Fischer
124ff6c50a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10531] Disallow deleting of the last style

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-16 16:19:22 +01:00
Andreas Fischer
8f690d3475 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:17:40 +01:00
Andreas Fischer
56c3a66c28 Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3.0.10 
* nickvergessen/ticket/10531:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:03:20 +01:00
Andreas Fischer
93701adf02 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
 2011-12-16 15:50:11 +01:00
Andreas Fischer
f4bdfda69d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
 2011-12-16 15:50:04 +01:00
Andreas Fischer
1d9fb6b4ec Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into prep-release-3.0.10 
* nickvergessen/ticket/revert/8996:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
 2011-12-16 15:49:30 +01:00
Andreas Fischer
c575fb33f6 Merge remote-tracking branch 'imkingdavid/ticket/10463' into develop 
* imkingdavid/ticket/10463:
  [ticket/10463] removed extra comma in malformed query in acp_styles.php
 2011-12-16 10:46:59 +01:00
David King
fd58a0ad37 [ticket/10535] Forgot a subsilver2 change. *doh* 
PHPBB3-10535
 2011-12-15 23:17:21 +00:00
David King
d73c3a297e [ticket/10535] Removed email confirm from UCP, removed unused language entries 
PHPBB3-10535
 2011-12-15 23:15:24 +00:00
Joas Schilling
0cfa843677 [ticket/10531] Disallow deleting of the last style 
Regression from PHPBB3-9675 commit 0e02f5cb0b

PHPBB3-9675
PHPBB3-10531
 2011-12-15 23:17:16 +01:00
Joas Schilling
2bf4e8d3d0 [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 
Revert
"[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey"

This reverts commit 219bdbaf70.

PHPBB3-8996
 2011-12-15 22:17:39 +01:00
Joas Schilling
730d2d5d19 [ticket/8996] Revert initial fix to keep old behaviour on empty selection 
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b.

PHPBB3-8996
 2011-12-15 22:14:59 +01:00
David King
18aa4e4ecd [ticket/10535] Remove email confirm check on registration form 
PHPBB3-10535
 2011-12-15 15:13:11 +00:00
Vjacheslav Trushkin
80149d0c87 [ticket/10507] DBAL unit test 
Unit test for ORDER BY LOWER(style_name)

PHPBB3-10507
 2011-12-15 16:18:52 +02:00
David King
a3e8d3b00b [ticket/10463] removed extra comma in malformed query in acp_styles.php 
PHPBB3-10463
 2011-12-15 13:22:04 +00:00
Vjacheslav Trushkin
cd4958f72c [ticket/10507] Sort styles in acp 
Sort styles by name in admin control panel

PHPBB3-10507
 2011-12-15 14:44:09 +02:00
Oleg Pudeyev
6233bde5ed Merge remote-tracking branch 'imkingdavid/ticket/10524' into develop 
* imkingdavid/ticket/10524:
  [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places
 2011-12-14 20:44:00 -05:00
Nils Adermann
72eb1ad8cc Merge remote-tracking branch 'github-igorw/feature/functional-tests' into develop 
* github-igorw/feature/functional-tests:
  [feature/functional-tests] Introduce bootstrap method
  [feature/functional-tests] Make sure functional tests only install once
 2011-12-14 14:35:20 +01:00
David King
b05c325dd2 [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places 
PHPBB3-10524
 2011-12-12 20:23:20 +00:00
Nils Adermann
94d954281e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:32:29 +01:00
Nils Adermann
2c7495e1c7 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:32:21 +01:00
Nils Adermann
57ba746f51 Merge branch 'ticket/cyberalien/10319' into prep-release-3.0.10 
* ticket/cyberalien/10319:
  [ticket/10319] Missing hidden fields in search form
 2011-12-09 01:31:57 +01:00
Vjacheslav Trushkin
dfb7cc625a [ticket/10319] Missing hidden fields in search form 
Missing hidden fields in search form (bug added in 3.0.9)

PHPBB3-10319
 2011-12-09 01:31:41 +01:00
Joas Schilling
8af9a0054c [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 
Revert "[ticket/6632] Better viewing of topics for wide screen displays"

This reverts commit bb733b0204.

PHPBB3-6632
PHPBB3-10504
 2011-12-08 23:14:02 +01:00
Joas Schilling
e3d81812fa [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 
Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and
MCP"

This reverts commit 88aacd0f2c.

PHPBB3-6632
PHPBB3-10408
PHPBB3-10504
 2011-12-08 23:07:44 +01:00
Joas Schilling
1a09f9005c [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485 
Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632"

This reverts commit c67633577f.

PHPBB3-6632
PHPBB3-10485
PHPBB3-10504
 2011-12-08 23:05:13 +01:00
Andreas Fischer
f4f82ac5bd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10511] Fix a grammar defect in permissions language.
 2011-12-08 22:22:29 +01:00
Andreas Fischer
7ae12df3d2 Merge remote-tracking branch 'p/ticket/10511' into develop-olympus 
* p/ticket/10511:
  [ticket/10511] Fix a grammar defect in permissions language.
 2011-12-08 22:22:22 +01:00
Andreas Fischer
a8ee32a66b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9876] Distinctly name user and forum roles for newly registered users.
 2011-12-08 22:22:06 +01:00
Andreas Fischer
48d767a36e Merge remote-tracking branch 'p/ticket/9876' into develop-olympus 
* p/ticket/9876:
  [ticket/9876] Distinctly name user and forum roles for newly registered users.
 2011-12-08 22:21:54 +01:00
Vjacheslav Trushkin
1842323ca9 [ticket/10399] Correctly encoding template component urls (3.0) 
Changes in style.php

PHPBB3-10399
 2011-12-04 11:43:55 +02:00
Oleg Pudeyev
b05c658722 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10434] Add script for creating search index from CLI.
 2011-12-03 22:42:01 -05:00
Oleg Pudeyev
1ce0c76e14 Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympus 
* bantu/ticket/10434:
  [ticket/10434] Add script for creating search index from CLI.
 2011-12-03 22:28:05 -05:00
Oleg Pudeyev
0c0befe2f8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
 2011-12-03 22:25:32 -05:00
Oleg Pudeyev
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus 
* Noxwizard/ticket/10349:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
 2011-12-03 22:07:34 -05:00
Oleg Pudeyev
552df1f6eb [ticket/10500] Use correct class name in @uses. 
PHPBB3-10500
 2011-12-03 21:15:29 -05:00
Oleg Pudeyev
c4a19a4e3e [ticket/10500] Fix phpbb_template_compile instantiation. 
The required $allow_php argument was missing.

PHPBB3-10500
 2011-12-03 21:15:29 -05:00
Andreas Fischer
3176dcbc05 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

Conflicts:
	phpBB/install/database_update.php
 2011-12-04 00:25:54 +01:00
Andreas Fischer
138f123bd8 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2011-12-04 00:24:22 +01:00
Andreas Fischer
69cbb4ac1d [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 2011-12-04 00:22:10 +01:00
Andreas Fischer
7d47670c23 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
 2011-12-04 00:06:14 +01:00
Andreas Fischer
9b9f30bbb9 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
 2011-12-04 00:06:06 +01:00
Andreas Fischer
6f81a2f5b8 Merge remote-tracking branch 'nickvergessen/ticket/10503' into prep-release-3.0.10 
* nickvergessen/ticket/10503:
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
 2011-12-04 00:05:56 +01:00
Andreas Fischer
9668420554 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10093] Use correct ANSI code for clearing color.
  [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
  [ticket/10093] Use color in commit-msg hook warning/error messages.
  [ticket/10093] Refactor complaining in commit-msg hook for color support.
  [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
  [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
 2011-12-04 00:04:55 +01:00
Andreas Fischer
74bc2d130d Merge remote-tracking branch 'p/ticket/10093' into develop-olympus 
* p/ticket/10093:
  [ticket/10093] Use correct ANSI code for clearing color.
  [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.
  [ticket/10093] Use color in commit-msg hook warning/error messages.
  [ticket/10093] Refactor complaining in commit-msg hook for color support.
  [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.
  [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
 2011-12-03 23:56:00 +01:00