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

18570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nils Adermann
09ec65cb9b [ticket/11194] Service tag data is stored in an array so access it correctly 
PHPBB3-11194
 2012-11-12 01:01:02 +01:00
Vjacheslav Trushkin
3e03f95cb7 [ticket/10431] CSS3 buttons 
CSS3 replacements for big buttons

PHPBB3-10431
 2012-11-11 19:07:00 +01:00
Igor Wiedler
05380c8d0e Merge pull request #1076 from naderman/ticket/11193 
[ticket/11193] Instantiate a single collection_pass for all collections
 2012-11-11 10:05:06 -08:00
Nathaniel Guse
7948aaa78e [ticket/11103] Make jabber use short/ email template files 
PHPBB3-11103
 2012-11-11 11:41:18 -06:00
Nils Adermann
d2a051cdd4 [ticket/11193] Instantiate a single collection_pass for all collections 
PHPBB3-11193
 2012-11-11 18:39:24 +01:00
Nathaniel Guse
985d234a29 [ticket/11103] Move all email templates to the email/ directory & prep short 
Prepare short email templates (to be used in jabber)

PHPBB3-11103
 2012-11-11 11:37:14 -06:00
Nils Adermann
69845585a2 Merge pull request #1056 from igorw/feature/compiled-dic 
[feature/compiled-dic] Compile the DI Container into a cached class
 2012-11-11 09:05:15 -08:00
Igor Wiedler
1bf7f0bde7 [ticket/11152] Basic tests for the container functions 
PHPBB3-11152
 2012-11-11 17:56:09 +01:00
Igor Wiedler
00417fc723 [ticket/11152] Compile the install container 
PHPBB3-11152
 2012-11-11 17:54:54 +01:00
Igor Wiedler
5616972195 [ticket/11152] Throw error if services.yml is missing 
PHPBB3-11152
 2012-11-11 17:53:24 +01:00
Andreas Fischer
ac9c4d7d59 [ticket/11162] Make count function upper case. 
PHPBB3-11162
 2012-11-11 17:49:21 +01:00
Andreas Fischer
7d0cc15b92 [ticket/11162] Rename count variable name to remaining_rows. 
PHPBB3-11162
 2012-11-11 17:48:59 +01:00
Igor Wiedler
844770d223 [ticket/11152] Remove old container processor calls 
PHPBB3-11152
 2012-11-11 17:43:12 +01:00
Andreas Fischer
b0812c43fa [ticket/11162] Use integer casting instead of SQL escape. 
PHPBB3-11162
 2012-11-11 17:40:58 +01:00
Igor Wiedler
09781a96bc [ticket/11152] Use realpath in container extensions consistently 
PHPBB-11152
 2012-11-11 16:34:41 +01:00
Andreas Fischer
c699b88bc5 [ticket/11192] Add Tebibyte to get_formatted_filesize(). 
PHPBB3-11192
 2012-11-11 14:35:31 +01:00
Igor Wiedler
3e4d3761fd [ticket/11152] Rename collection to collection_pass 
PHPBB3-11152
 2012-11-11 14:18:11 +01:00
Andreas Fischer
504158ceab Merge remote-tracking branch 'nickvergessen/ticket/11077' into develop 
* nickvergessen/ticket/11077:
  [ticket/11077] Remove code from old global announcements system
 2012-11-11 13:59:11 +01:00
Joas Schilling
f2cb4e1911 [ticket/11077] Remove code from old global announcements system 
PHPBB3-11077
 2012-11-11 13:04:14 +01:00
Joas Schilling
72d1cae3f3 [ticket/10714] Remove some private functions from the log interface 
PHPBB3-10714
 2012-11-11 12:29:25 +01:00
Joas Schilling
35089bc013 [ticket/10714] Fix some comments 
PHPBB3-10714
 2012-11-11 12:18:04 +01:00
Fyorl
db0cc74af0 [ticket/11190-develop] Functional tests purge cache before running. 
PHPBB3-11190
 2012-11-11 10:53:44 +00:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running. 
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
 2012-11-11 10:44:47 +00:00
Nathaniel Guse
84ba10ec8c Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-11 04:42:06 -06:00
Vjacheslav Trushkin
f72eaa0d95 [ticket/11175] Add microdata to prosilver 
Add breadcrumb microdata to prosilver

PHPBB3-11175
 2012-11-11 11:15:48 +01:00
Vjacheslav Trushkin
9b2024a48e [ticket/11175] Add microdata to subsilver2 
Add breadcrumb data to subsilver2

PHPBB3-11175
 2012-11-11 11:11:47 +01:00
Andreas Fischer
e86ecc0f3b Merge remote-tracking branch 'Fyorl/ticket/10939' into develop 
* Fyorl/ticket/10939:
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10939] Added tests for phpbb_request::file
  [ticket/10939] Modified the default return for $request->file
  [ticket/10939] Modified fileupload tests to deal with new behaviour
  [ticket/10939] Modified mock request class to handle deactivated $_FILES
  [ticket/10939] Modified acp_groups.php to not use $_FILES
  [ticket/10939] Modified ucp_groups.php to not use $_FILES
  [ticket/10939] Modified functions_user.php to not use $_FILES
  [ticket/10939] Modified message_parser.php to not use $_FILES
  [ticket/10939] Modified functions_upload to not use $_FILES
  [ticket/10939] Modified request test slightly to include $_FILES
  [ticket/10939] Added $_FILES handling to phpbb_request
 2012-11-10 23:49:29 +01:00
Andreas Fischer
847feb07e7 Merge remote-tracking branch 'EXreaction/ticket/11189' into develop 
* EXreaction/ticket/11189:
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
 2012-11-10 23:39:00 +01:00
Igor Wiedler
bdbf7d5de6 [ticket/11152] Remove @api docblocks 
PHPBB3-11152
 2012-11-10 23:36:13 +01:00
Igor Wiedler
8851b797fb [ticket/11152] Create separate function for debug-dependent container 
PHPBB3-11152
 2012-11-10 23:35:52 +01:00
Igor Wiedler
231d743ba9 [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection 
PHPBB3-11152
 2012-11-10 23:34:27 +01:00
Nathaniel Guse
106daa09eb [ticket/11103] Fix failed automerge 
PHPBB3-11103
 2012-11-10 11:20:06 -06:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-11-10 10:58:44 -06:00
Nathaniel Guse
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG 
PHPBB3-11189
 2012-11-10 10:45:02 -06:00
Nathaniel Guse
7085a6c74d [ticket/11189] Always log critical errors when in cron or in image output 
PHPBB3-11189
 2012-11-10 10:12:25 -06:00
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970 
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
 2012-11-10 07:46:50 -08:00
Joas Schilling
51966bd497 [feature/soft-delete]Fix the rest of unit tests failures 
PHPBB3-9567
 2012-11-10 16:41:43 +01:00
Igor Wiedler
798c006e7f [ticket/11152] Convert cron_task_collection to generic di_service_collection 
PHPBB3-11152
 2012-11-10 16:38:19 +01:00
Andreas Fischer
3f933c6870 Merge remote-tracking branch 'Fyorl/ticket/11187' into develop 
* Fyorl/ticket/11187:
  [ticket/11187] Added a blank array to fix errors in functional tests
 2012-11-10 14:58:03 +01:00
Fyorl
c73293d826 [ticket/11187] Added a blank array to fix errors in functional tests 
PHPBB3-11187
 2012-11-10 13:46:40 +00:00
Joas Schilling
f7f21fa692 [ticket/11186] Database unit tests fail on windows using sqlite2 
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
 2012-11-10 14:34:52 +01:00
Andreas Fischer
f5ed04f8ff Merge remote-tracking branch 'bantu/ticket/10780' into develop 
* bantu/ticket/10780:
  [ticket/10780] Make L_COLON available in the installer.
 2012-11-10 14:07:03 +01:00
Andreas Fischer
40f3ae1d8f Merge remote-tracking branch 'igorw/ticket/11183' into develop 
* igorw/ticket/11183:
  [ticket/11183] Remove $load_extensions and weird dl() calls
 2012-11-10 14:02:45 +01:00
Andreas Fischer
3ea5b0abbd [ticket/10780] Make L_COLON available in the installer. 
PHPBB3-10780
 2012-11-10 12:53:45 +01:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
 2012-11-10 12:27:19 +01:00
Joas Schilling
03821ad2a2 [feature/soft-delete] Use a beautiful recycle icon for softdeleted topics 
PHPBB3-9567
 2012-11-10 12:16:45 +01:00
Igor Wiedler
38e1c4ec5d [ticket/11152] Use relative root path in container, one dumped container per path 
PHPBB3-11152
 2012-11-10 12:02:56 +01:00
Igor Wiedler
897e8f2e83 [ticket/11152] Move container functions to a separate function file 
PHPBB3-11152
 2012-11-10 12:02:56 +01:00
David King
3f2cbaac34 [feature/compiled-dic] Rename $phpEx to $php_ext in new code 
PHPBB3-11152
 2012-11-10 12:02:56 +01:00
David King
2de8827b1e [feature/compiled-dic] Use an absolute path for core.root_path parameter 
PHPBB3-11152
 2012-11-10 12:02:56 +01:00