mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
17,733 Commits 10 Branches 193 Tags
60641d7dbe5f28c55db51b4ad3620f1137b9e73f
Commit Graph

7864 Commits

Author SHA1 Message Date
Nathan Guse
bcf7ea3310 Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop 
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
  [ticket/11533] Update unit tests
  [ticket/11533] Fix colspan and unnecessary tables
  [ticket/11533] Change list to table for notification settings
  [ticket/11533] Columns counter for notification settings
 2013-05-12 18:56:34 -05:00
Nathan Guse
f93a750f28 Merge remote-tracking branch 'remotes/Marc/ticket/11465' into develop 
# By Marc Alexander (8) and Joas Schilling (3)
# Via Marc Alexander
* remotes/Marc/ticket/11465:
  [ticket/11465] Increase count of disabled extensions to 5 in functional test
  [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
  [ticket/11465] Add tests for optional arguments of get_module_infos()
  [ticket/11465] Add comments explaining the tests
  [ticket/11465] Check if class exists before including info file
  [ticket/11465] Correctly set the root path for the test
  [ticket/11465] The info file does not have _info suffix
  [ticket/11465] Add phpBB module to test
  [ticket/11465] Move require_once() in unit test to the top of the file
  [ticket/11465] Add unit tests for acp_modules::get_module_infos()
  [ticket/11465] Use extension finder when adding extensions' acp modules
 2013-05-12 18:49:23 -05:00
Nils Adermann
a42693e66d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.

Conflicts:
	phpBB/includes/functions.php
 2013-05-12 23:09:41 +02:00
gamerchan
d680aac7c5 [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions. 
There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.

PHPBB3-11105
 2013-05-12 22:57:40 +02:00
Marc Alexander
7e70eec5a3 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465 2013-05-12 22:41:00 +02:00
Dhruv
d522dc5372 Merge branch 'ticket/10820' into ticket/10820-develop 
* ticket/10820:
  [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7

Conflicts:
	phpBB/download/file.php
 2013-05-12 16:09:01 +05:30
Nathaniel Guse
fe13b89dd4 Merge remote-tracking branch 'remotes/bantu/ticket/11452' into develop 2013-05-11 20:52:52 -05:00
Vjacheslav Trushkin
b40c6fe46a [ticket/11533] Columns counter for notification settings 
Add columns counter template variable. It counts number of
notification types + column for name + column for checkbox

PHPBB3-11533
 2013-05-11 23:30:44 +03:00
Nathan Guse
f91f8666fd [ticket/11415] Send the extension base the finder rather than the manager 
PHPBB3-11415
 2013-05-10 14:01:31 -05:00
Nathan Guse
27b2bbb8ff [ticket/11415] Create function in finder find_from_extension 
PHPBB3-11415
 2013-05-10 13:58:55 -05:00
Nathan Guse
cb13747c4b [ticket/11420] Rename migrations file to something more helpful 
PHPBB3-11420
 2013-05-10 13:44:38 -05:00
Nathan Guse
7d66a9ad52 [ticket/11413] Translate the error 
PHPBB3-11413
 2013-05-10 13:42:54 -05:00
Nathan Guse
c9ff315132 [ticket/11413] Rename file to something more helpful 
PHPBB3-11413
 2013-05-10 13:40:49 -05:00
OpenShift guest
a50d23078e [ticket/11458] Use finder to get all permission language files 
PHPBB3-11458
 2013-05-10 10:15:25 -04:00
Oleg Pudeyev
6821a27ccf Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop 
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/10155:
  [ticket/10155] Update copyright in new migration file to 2013
  [ticket/10155] Make effectively installed test more specific
  [ticket/10155] Use more descriptive title for migration file
  [ticket/10155] Use new migration file for jQuery config update
  [ticket/10155] Update jQuery to 1.8.3
 2013-05-08 19:35:59 -04:00
Oleg Pudeyev
88d4964f0e Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
  [ticket/10325] move migration into a new file
  [ticket/10325] fix acp language
  [ticket/10325] use assert_response_success parts
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] add assert_response_success in test
  [ticket/10325] functional tests for forgot password functionality
  [ticket/10325] add logout function in functional_test_case
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] improve acp option language
  [ticket/10325] fix language key
  [ticket/10325] fix language variable
  [ticket/10325] change language var
  [ticket/10325] fix language
  [ticket/10325] add new config value to database
  [ticket/10325] trigger error if forgot password option disabled
  [ticket/10325] add allow forgot password option in acp
 2013-05-08 08:23:11 -04:00
Dhruv
284011ebf2 [ticket/10325] move migration into a new file 
PHPBB3-10325
 2013-05-08 17:04:03 +05:30
Joas Schilling
62f35121d9 [ticket/11450] Fix all instances of phpbb_extension_metadata_manager 
PHPBB3-11450
 2013-05-08 08:47:21 +02:00
Joas Schilling
001e3ebe9e [ticket/11450] Fix doc blocks and add missing class var $config 
PHPBB3-11450
 2013-05-08 08:46:04 +02:00
Joas Schilling
5794b3d621 [ticket/11450] Sort parameters alphabetically 
PHPBB3-11450
 2013-05-08 08:46:03 +02:00
Joas Schilling
b63a148e08 [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct() 
PHPBB3-11450
 2013-05-08 08:46:02 +02:00
Andreas Fischer
5fba9c22dd Merge remote-tracking branch 'p-push/ticket/11435' into develop 
* p-push/ticket/11435:
  [ticket/11435] Fit comment into 80 columns and link to php manual.
 2013-05-06 22:25:41 +02:00
Andreas Fischer
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
Andreas Fischer
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
Oleg Pudeyev
01eded7cc2 Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into develop 
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/11288:
  [ticket/11288] fix regex in postgres
  [ticket/11288] add search tests cases
 2013-05-06 15:46:00 -04:00
Gaëtan Muller
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
Matt Friedman
153be855ca [ticket/10155] Update copyright in new migration file to 2013 
PHPBB3-10155
 2013-05-06 09:49:37 -07:00
Dhruv
bfdc6e1930 [ticket/11288] fix regex in postgres 
Postgres search backend now uses updated regex being used by
mysql search backend.

PHPBB3-11288
 2013-05-04 20:11:12 +05:30
Nathaniel Guse
3c76cdeb67 [ticket/11413] Remove remaining irrelevant code to this PR 
PHPBB3-11413
 2013-05-03 08:50:27 -05:00
Nils Adermann
7320e4a535 Merge pull request #1348 from nickvergessen/ticket/11495 
Ticket/11495 Nested Set Implementation
 2013-05-02 15:04:19 -07:00
Nathaniel Guse
5edae8af1f [ticket/11413] Remove conversion of user_notifications 
PHPBB3-11413
 2013-05-02 15:52:20 -05:00
Nathaniel Guse
bc9b6c3b6c [ticket/11413] Correct copyright year 
PHPBB3-11413
 2013-05-02 15:49:17 -05:00
Nathaniel Guse
a4fe72bd53 [ticket/11420] Fix notification options conversion 
PHPBB3-11420
 2013-05-02 15:40:43 -05:00
Nathaniel Guse
07c972f5d7 [ticket/11413] Remove changes for ticket 11420 from this branch 
PHPBB3-11413
 2013-05-02 15:39:26 -05:00
Oleg Pudeyev
32f247ed60 [ticket/11435] Fit comment into 80 columns and link to php manual. 
PHPBB3-11435
 2013-05-01 17:21:49 -04:00
Nathaniel Guse
87b01fc854 [ticket/11415] Make migrator/ext.manager dependencies of the base ext class 
PHPBB3-11415
 2013-05-01 15:18:53 -05:00
Nathaniel Guse
60e3272839 [ticket/11415] Remove migrator dependency from extension manager 
PHPBB3-11415
 2013-05-01 14:09:08 -05:00
Nathaniel Guse
7ed21cc6f2 [ticket/11415] Move migrator to base extension class from ext.manager 
PHPBB3-11415
 2013-05-01 14:02:13 -05:00
Nathaniel Guse
9db4e856db [ticket/11415] Move while loop from ext manager to acp_extensions.php 
Now enable_step works as it's supposed to (do one step at a time) and
less refreshes are required for the user.

PHPBB3-11415
 2013-05-01 13:00:43 -05:00
Nathaniel Guse
2f2feaa4e8 [ticket/11413] Don't use the database for the convert test 
Different databases seem to work slightly differently here and are causing
errors

PHPBB3-11413
 2013-04-30 21:38:40 -05:00
Nathaniel Guse
81b2ad158c [ticket/11413] Use sql_insert_buffer 
PHPBB3-11413
 2013-04-30 21:01:46 -05:00
Joas Schilling
d7787682df [ticket/11495] Throw exception when item that should be deleted does not exist 
PHPBB3-11495
 2013-04-30 22:19:35 +02:00
Joas Schilling
6a7378ecbd [ticket/11495] Some more doc changes 
PHPBB3-11495
 2013-04-30 18:39:22 +02:00
Joas Schilling
2f54a63b0f [ticket/11495] Fix more grammar issues in doc blocks 
PHPBB3-11495
 2013-04-30 18:24:54 +02:00
Joas Schilling
98e6207c35 [ticket/11495] Fix "as well" typo and remove brackets 
PHPBB3-11495
 2013-04-30 18:13:32 +02:00
Joas Schilling
5c4d69581a [ticket/11495] Do not reset item_parent if not required 
PHPBB3-11495
 2013-04-30 18:06:29 +02:00
Joas Schilling
f3f7be4cd1 [ticket/11495] Fix @return doc of get_sql_where() 
PHPBB3-11495
 2013-04-30 17:11:55 +02:00
Joas Schilling
6055a3cc7e [ticket/11495] Remove useless release_lock() method 
PHPBB3-11495
 2013-04-30 16:19:25 +02:00
Joas Schilling
78b0d3e723 [ticket/11495] Use $lock->owns_lock() instead of own property 
PHPBB3-11495
 2013-04-30 15:50:14 +02:00
Joas Schilling
714092ab4e [ticket/11495] Add owns_lock() method to lock classes 
PHPBB3-11495
 2013-04-30 15:48:29 +02:00