mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
24,106 Commits 17 Branches 190 Tags
Commit Graph

24106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
afe99f9050 [ticket/13553] Add a method to the controller helper to display a message 
PHPBB3-13553
 2015-01-29 19:08:32 +01:00
Andreas Fischer
40e676ad03 [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. 2015-01-29 18:17:29 +01:00
Dhruv
cc210b1842 Merge remote-tracking branch 'upstream/prep-release-3.0.13' into develop-olympus 2015-01-29 11:51:33 +05:30
Dhruv Goel
36f8fb2b37 Merge pull request #3347 from bantu/ticket/13554 
[ticket/13554] Show feature release upgrades in blue rather than red.
 2015-01-29 11:47:37 +05:30
Andreas Fischer
5b96d30540 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.

Conflicts:
	phpBB/includes/startup.php
	tests/security/trailing_path_test.php
 2015-01-29 00:09:12 +01:00
Andreas Fischer
6f5524de26 Merge branch 'prep-release-3.0.13' into develop-olympus 
* prep-release-3.0.13:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
 2015-01-29 00:08:23 +01:00
Andreas Fischer
872caf805c Merge pull request #3348 from bantu/ticket/13549 
[ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME...

* bantu/ticket/13549:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
 2015-01-29 00:06:00 +01:00
Andreas Fischer
ef10b02f78 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:03:31 +01:00
Andreas Fischer
f48cc8bbe9 Merge branch 'prep-release-3.0.13' into develop-olympus 
* prep-release-3.0.13:
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:03:16 +01:00
Andreas Fischer
8da3a6f117 Merge pull request #3349 from bantu/ticket/12933 
[ticket/12933] Handle case when * is last character of word

* bantu/ticket/12933:
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:03:05 +01:00
Andreas Fischer
f0f88c287c Merge pull request #3338 from dhruvgoel92/ticket/12933 
[ticket/12933] Handle *wildcard character in native search

* dhruvgoel92/ticket/12933:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:02:41 +01:00
Marc Alexander
7495055907 [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. 
The ORIG_PATH_INFO on IIS also contains the script name. Only use that
for killing the script after removing the script name from ORIG_PATH_INFO.

PHPBB3-13549
 2015-01-28 22:07:16 +01:00
Dhruv
5eb0d422c8 [ticket/12933] Handle case when * is last character of word 
PHPBB3-12933
 2015-01-28 21:59:58 +01:00
Andreas Fischer
dff1ea6b85 [ticket/13554] Show feature release upgrades in blue rather than red. 
PHPBB3-13554
 2015-01-28 21:59:03 +01:00
Andreas Fischer
e3e427fa24 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13414] Set Content-Length header only if status is not 304

Conflicts:
	phpBB/download/file.php
 2015-01-28 19:56:47 +01:00
Andreas Fischer
9d72463824 Merge pull request #3343 from marc1706/ticket/13414 
[ticket/13414] Set Content-Length header only if status is not 304

* marc1706/ticket/13414:
  [ticket/13414] Set Content-Length header only if status is not 304
 2015-01-28 19:48:42 +01:00
Dhruv
35edd7a043 [ticket/12933] Add test cases for * wildcard searches 
PHPBB3-12933
 2015-01-28 21:46:38 +05:30
Dhruv
252018b813 Merge branch 'ticket/12933-olympus' into ticket/12933 2015-01-28 21:41:24 +05:30
Dhruv
be90e97452 [ticket/12933] Handle case when * is last character of word 
PHPBB3-12933
 2015-01-28 21:37:03 +05:30
Marc Alexander
a9fa20bb91 [ticket/13414] Set Content-Length header only if status is not 304 
PHPBB3-13414
 2015-01-28 15:50:48 +01:00
brunoais
4b16add055 [ticket/13544] Use integer case because $role_id is an int 
PHPBB3-13544
 2015-01-26 22:00:20 +00:00
brunoais
73d1bf9fea [ticket/13544] Fixing wrong SQL query for permission_unset for roles 
PHPBB3-13544
 2015-01-26 19:21:22 +00:00
Joas Schilling
b2b5addd09 [prep-release-3.1.3] Add changelog for 3.1.3-RC1 release-3.1.3-RC1 2015-01-26 20:09:46 +01:00
Joas Schilling
513b2f8296 [prep-release-3.1.3] Prepare Changelog 2015-01-26 20:00:11 +01:00
Joas Schilling
32b25d7b11 [prep-release-3.1.3] Add migration for 3.1.3-RC1 2015-01-26 19:43:36 +01:00
Joas Schilling
acfb9b9539 [prep-release-3.1.3] Update version to 3.1.2-RC1 2015-01-26 19:42:06 +01:00
Nils Adermann
1c6ebcf02b Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
 2015-01-26 19:01:34 +01:00
Nils Adermann
ebd5aace3f Merge branch 'prep-release-3.0.13' into develop-olympus 
* prep-release-3.0.13:
  [prep-release-3.0.13] Bump version numbers for 3.0.13 release
  [prep-release-3.0.13] Highlight security relevant changes

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2015-01-26 18:57:06 +01:00
Nils Adermann
5ce89ae82f [prep-release-3.0.13] Bump version numbers for 3.0.13 release 2015-01-26 18:08:31 +01:00
Nils Adermann
4b42589cfa [prep-release-3.0.13] Highlight security relevant changes 2015-01-26 17:53:43 +01:00
Andreas Fischer
ffbe8cdc96 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12089] Add assert message on HTTP status code check
 2015-01-26 02:47:38 +01:00
Andreas Fischer
4c11ea97d5 Merge pull request #3339 from nickvergessen/ticket/12089 
[ticket/12089] Add assert message on HTTP status code check

* nickvergessen/ticket/12089:
  [ticket/12089] Add assert message on HTTP status code check
 2015-01-26 02:47:36 +01:00
Joas Schilling
ed2d080551 [ticket/12089] Add assert message on HTTP status code check 
PHPBB3-12089
 2015-01-25 23:06:56 +01:00
kasimi
33d7eb69ef [ticket/13540] Added var row to both events 
PHPBB3-13540
 2015-01-25 13:01:02 +01:00
Marc Alexander
a2fbde44c0 Merge pull request #3336 from nickvergessen/ticket/13543 
Ticket/13543
 2015-01-24 21:52:56 +01:00
Joas Schilling
b2674cf1f6 [ticket/13543] Fix broken slow test 
PHPBB3-13543
 2015-01-24 21:10:53 +01:00
Joas Schilling
c423038587 [ticket/13543] Add slow tests to travis matrix 
PHPBB3-13543
 2015-01-24 21:10:35 +01:00
paulsohier
0cfa977953 [ticket/13542] Added sentenence of what is changed in the event 
PHPBB3-13542
 2015-01-24 20:26:51 +01:00
kasimi
12fba95892 [ticket/13540] Add core event for MCP topic review block data 
Similar to the previous event, this event triggers for each post in the
MCP topic review.

PHPBB3-13540
 2015-01-24 19:41:27 +01:00
paulsohier
c86e5e8514 [ticket/13542] Merge result of validation into existing $error 
Because extensions can set a entry in $error, the result of the validate
needs to be merged into it.

PHPBB3-13542
 2015-01-24 19:04:26 +01:00
paulsohier
b0383a90e1 [ticket/13542] Update core.ucp_prefs_personal_data to include $error 
Update the event so extensions will be able to validate (and deny) changes.

PHPBB3-13542
 2015-01-24 18:53:33 +01:00
Marc Alexander
a5c65449de [ticket/13538] Add tests for double nested pagination loop 
PHPBB3-13538
 2015-01-24 14:35:49 +01:00
Marc Alexander
ee03b4f1ef [ticket/13538] Fix tests for pagination in nested loop 
PHPBB3-13538
 2015-01-24 14:27:04 +01:00
kasimi
a35fbdb3e9 [ticket/13540] Updated @since version to 3.4.1-RC1, fixed @var indentations 
PHPBB3-13540
 2015-01-24 12:23:10 +01:00
kasimi
40798ae616 [ticket/13540] Add core event for modifying topic review block data 
Added event core.topic_review_modify_row in function topic_review() in
functions_posting for modifying template data blocks for topic reviews.

PHPBB3-13540
 2015-01-24 02:09:29 +01:00
Joas Schilling
9cdbb69f9e Merge pull request #3321 from marc1706/ticket/13282 
[ticket/13282] Use 0 as default for integer type columns in postgresql
 2015-01-23 17:32:28 +01:00
Wolfsblvt
8a0c227bf9 [ticket/13537] Add core events on mcp_queue for approval and disapproval 
Events added for the functions approve_posts(), approve_topics()
and disapprove_posts() in mcp_queue.php, so that you can send notifications
during approval and disapproval.

PHPBB3-13537
 2015-01-23 13:01:34 +01:00
Wolfsblvt
b88b8305fd [ticket/13518] Add core event to markread() in functions.php 
Adding core event core.markread_before to to funtion markread()
in functions.php, so that you now are able to add additional
stuff inside the markread process, for example notifications designed
in extensions.

PHPBB3-13518
 2015-01-23 12:53:46 +01:00
Wolfsblvt
1dce9576e9 [ticket/13532] Add core event to get_unread_topics() in functions.php 
Adding core event core.get_unread_topics_modify_sql to to funtion
get_unread_topics() in functions.php, so that you now are able to modify
the sql query that retrieves the unread topics.

PHPBB3-13532
 2015-01-23 12:48:57 +01:00
Marc Alexander
7014d824f0 [ticket/13538] Add test for pagination in nested loop 
PHPBB3-13538
 2015-01-23 11:48:05 +01:00