makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-14 07:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
12564 commits 18 branches 192 tags 206 MiB
Commit graph

11802 commits

Author SHA1 Message Date
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
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
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
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
Oleg Pudeyev
5b9c835127 [ticket/9876] Distinctly name user and forum roles for newly registered users. 
PHPBB3-9876
 2011-12-03 17:44:58 -05:00
Oleg Pudeyev
0ad81a4cdc [ticket/10511] Fix a grammar defect in permissions language. 
PHPBB3-10511
 2011-12-03 17:42:10 -05:00
Oleg Pudeyev
6027541dc7 Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into develop 
* nickvergessen/ticket/develop/10345: (21 commits)
  [ticket/10345] Check directly whether the key to use exists
  [ticket/10345] Return the language key when the key has an empty array
  [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form
  [ticket/10345] Remove doubled check for valid plural rule
  [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
  [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
  [ticket/10345] Fix parsing error in language/en/viewtopic.php
  [ticket/10345] Move rule determination code into a new function
  [ticket/10345] Fix little type in unit test
  [ticket/10345] Remove more useless 0-cases
  [ticket/10345] Make the use of the 0-case optional
  [ticket/10345] Remove some unused 0 cases
  [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
  [ticket/10345] Add tests for array() as first parameter on call to $user->lang()
  [ticket/10345] Fix some documentation issues.
  [ticket/10345] Allow float as array key and add some tests
  [ticket/10345] Use the plural function in some more places.
  [ticket/10345] Make use of the plural function in some basic places
  [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
  [ticket/10345] Fix documentation on the new function and the switch
  ...
 2011-12-03 15:39:06 -05:00
Nils Adermann
5e225d5d7a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:21:57 +01:00
Nils Adermann
cafe74a88d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:21:30 +01:00
Nils Adermann
29723c97c6 Merge remote-tracking branch 'github-bantu/ticket/10502' into prep-release-3.0.10 
* github-bantu/ticket/10502:
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:20:11 +01:00
Vjacheslav Trushkin
179543b2c7 [ticket/10399] Correctly encoding template component urls (3.1) 
Correctly encoding template component urls

PHPBB3-10399
 2011-12-01 01:50:54 +02:00
Vjacheslav Trushkin
74ae7d0339 [ticket/10399] Correctly encoding template component urls (3.0) 
Correctly encoding template component urls

PHPBB3-10399
 2011-12-01 01:46:33 +02:00
Joas Schilling
c1311faebf [ticket/10345] Check directly whether the key to use exists 
PHPBB3-10345
 2011-11-30 21:36:56 +01:00
Joas Schilling
65e6ab5530 [ticket/10345] Return the language key when the key has an empty array 
PHPBB3-10345
 2011-11-30 21:23:00 +01:00
Joas Schilling
dd99675f72 [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form 
The numbers are floored by casting to int.

PHPBB3-10345
 2011-11-30 21:07:53 +01:00
Joas Schilling
b195fce0a4 [ticket/10345] Remove doubled check for valid plural rule 
PHPBB3-10345
 2011-11-30 21:06:04 +01:00
Joas Schilling
b790d2e283 [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions 
PHPBB3-10345
 2011-11-30 21:03:29 +01:00
Andreas Fischer
af867de77c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:51 +01:00
Andreas Fischer
050fb83dfe Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:38 +01:00
Andreas Fischer
e596d2ca7e Merge remote-tracking branch 'nickvergessen/ticket/10501' into prep-release-3.0.10 
* nickvergessen/ticket/10501:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:25 +01:00
Andreas Fischer
8f1f42cc6c [ticket/10502] Fix typo in changelog. 'red' should have been 'read'. 
PHPBB3-10502
 2011-11-29 19:59:31 +01:00
Andreas Fischer
705730bfa7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
 2011-11-28 23:12:53 +01:00
Andreas Fischer
895501743d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
 2011-11-28 23:12:44 +01:00