mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:01:48 +02:00
Code Issues Releases Wiki Activity
25,122 Commits 18 Branches 192 Tags
917a5ce0df7977d8df15a9dc7a02547cce7bb41f
Commit Graph

9500 Commits

Author SHA1 Message Date
Joas Schilling
917a5ce0df Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2015-02-02 23:23:26 +01:00
Joas Schilling
7330c0afd3 Merge pull request #3325 from rxu/ticket/13536 
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
 2015-02-02 23:22:23 +01:00
Joas Schilling
7e7b337d27 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:19:49 +01:00
Joas Schilling
6678570f49 Merge pull request #3324 from rxu/ticket/13336 
[ticket/13336] Add core events to the function user_active_flip()
 2015-02-02 23:19:44 +01:00
Joas Schilling
2f060b8299 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:18:24 +01:00
Joas Schilling
e9eafece3f Merge pull request #3323 from rxu/ticket/13535 
[ticket/13535] Add core event to allow modifying account settings on editing
 2015-02-02 23:18:15 +01:00
Joas Schilling
eadacaa3ad Merge branch 'develop-ascraeus' into develop 2015-02-02 23:12:47 +01:00
Joas Schilling
0e6cd94fb4 Merge pull request #3317 from Wolfsblvt/ticket/13532 
Add core event to get_unread_topics() in functions.php
 2015-02-02 23:12:42 +01:00
Joas Schilling
517549eae6 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:09:41 +01:00
Joas Schilling
0aea283ab0 Merge pull request #3305 from Wolfsblvt/ticket/13518 
Add core event to markread() in functions.php
 2015-02-02 23:09:34 +01:00
Joas Schilling
f31d12ddf2 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:00:48 +01:00
Joas Schilling
7254a52812 Merge pull request #3282 from Elsensee/ticket/13313 
[ticket/13313] Add event core.acp_email_display
 2015-02-02 23:00:29 +01:00
Marc Alexander
8569e1c77a Merge branch 'develop-ascraeus' into develop 2015-02-02 21:06:02 +01:00
Marc Alexander
5182d02da5 Merge pull request #3334 from paul999/ticket/13542 
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
 2015-02-02 21:05:44 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config() 
PHPBB3-13494
 2015-02-02 19:28:23 +01:00
Joas Schilling
3c23242bfe Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-31 12:11:43 +01:00
Joas Schilling
dd182c5433 [prep-release-3.1.3] Update version to 3.1.3-RC2 2015-01-31 01:03:55 +01:00
Dhruv
ab07be8157 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 13:10:38 +05:30
Andreas Fischer
91ff42d501 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13414] Set Content-Length header only if status is not 304
 2015-01-28 19:57:29 +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
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log() 
PHPBB3-13468
 2015-01-27 18:34:33 +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
paulsohier
0cfa977953 [ticket/13542] Added sentenence of what is changed in the event 
PHPBB3-13542
 2015-01-24 20:26:51 +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
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
rxu
25b013f781 [ticket/13336] Add core events to the function user_active_flip() 
Add core events to the function user_active_flip() in
includes/functions_user.php to allow checking/modifying data while
activating/deactivating users.

PHPBB3-13336
 2015-01-23 08:20:00 +07:00
rxu
be1b114114 [ticket/13536] Add core events to allow modifying user profile data on editing 
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744

PHPBB3-13536
 2015-01-23 00:35:02 +07:00
rxu
e08cd70a89 [ticket/13535] Add core event to allow modifying account settings on editing 
Add ucp_profile.php core event to allow modifying account settings on editing.

PHPBB3-13535
 2015-01-22 23:10:05 +07:00
Andreas Fischer
14585fcb4f [develop-olympus] Increment version number to 3.0.14-dev. 2015-01-21 15:15:30 +01:00
Andreas Fischer
9f7f366573 [develop-olympus] Bump version numbers for 3.0.13-RC1 release. 2015-01-21 01:32:18 +01:00
Andreas Fischer
e34b92882a [ticket/13531] Send 404 Not Found. 
PHPBB3-13531
 2015-01-21 01:02:16 +01:00
Marc Alexander
4b9434bf1b [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO). 
PHPBB3-13531
 2015-01-21 01:02:08 +01:00
Andreas Fischer
d17904884e Merge pull request #3312 from bantu/ticket/13527 
[ticket/13527] Escape information received from version server

* bantu/ticket/13527:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.
 2015-01-20 23:14:38 +01:00
Andreas Fischer
a8027c542f Merge pull request #3311 from bantu/ticket/13526 
[ticket/13526] Correctly validate the ucp_pm_options form key.

* bantu/ticket/13526:
  [ticket/13526] Correctly validate the ucp_pm_options form key.
 2015-01-20 23:12:00 +01:00
Andreas Fischer
5069da8d52 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:11:40 +01:00
Andreas Fischer
4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php
 2015-01-20 23:11:29 +01:00
Andreas Fischer
3134b6b70e Merge pull request #3306 from marc1706/ticket/13519 
[ticket/13519] Correctly validate imagick path as path and not string

* marc1706/ticket/13519:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:10:19 +01:00
Andreas Fischer
92b5222295 [ticket/13527] Apply htmlspecialchars() to data from version server. 
PHPBB3-13527
 2015-01-20 22:40:39 +01:00
Andreas Fischer
251868dd7e [ticket/13527] Remove two unused variables. 
PHPBB3-13527
 2015-01-20 22:34:14 +01:00
Joas Schilling
23069a13e2 [ticket/13526] Correctly validate the ucp_pm_options form key. 
PHPBB3-13526
 2015-01-20 22:16:24 +01:00
Joas Schilling
358ca14ade Merge branch 'develop-ascraeus' into develop 2015-01-20 20:58:21 +01:00
Joas Schilling
40006376f2 Merge pull request #3226 from prototech/ticket/13420 
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
 2015-01-20 20:58:12 +01:00
Joas Schilling
2dcce57806 Merge branch 'develop-ascraeus' into develop 2015-01-20 17:31:24 +01:00
Joas Schilling
d99cd2d02e Merge pull request #3278 from rxu/ticket/13492 
[ticket/13492] Fix IDN support for custom BBCode URL tokens
 2015-01-20 17:31:06 +01:00
rxu
8002af7526 [ticket/13492] Add the migration to update custom bbcodes with IDN regexps 
Also fix the $utf8 checking regexp removing the curly braces.

PHPBB3-13492
 2015-01-20 08:47:56 +07:00
Nils Adermann
ebbe6a7791 Merge pull request #2990 from Senky/ticket/10985 
[ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
 2015-01-19 22:27:14 +01:00
Marc Alexander
6564446b0f [ticket/13519] Correctly validate imagick path as path and not string 
PHPBB3-13519
 2015-01-19 20:47:47 +01:00
Tristan Darricau
a537bf9619 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
 2015-01-19 17:52:37 +01:00