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

18005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Guse
dcf82d9a5a Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into develop 
* remotes/brunoais/ticket/11803:
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
 2013-08-28 12:49:44 -05:00
Nathan Guse
38a7aac0cc [ticket/11724] Handle ELSE IF separately 
PHPBB3-11724
 2013-08-28 12:29:01 -05:00
Joseph Warner
d204cdeee0 [ticket/11813] Change mock auth provider to implement base provider 
PHPBB3-11813
 2013-08-27 19:36:19 -04:00
brunoais
cc93f189a0 [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 
When it was made the min number of options allowed to a user was 1 but 0 can also be used as it means unlimited.

PHPBB3-11803
 2013-08-26 19:56:27 +01:00
Joas Schilling
44ddcf792f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11799] Send anti abuse headers in "new password" emails.
 2013-08-26 16:57:46 +02:00
Joas Schilling
78bfa8c01e Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympus 
* bantu/ticket/11799:
  [ticket/11799] Send anti abuse headers in "new password" emails.
 2013-08-26 16:54:34 +02:00
Joas Schilling
2ce83fce1e [ticket/11769] Allow '0' as username in notification mails 
PHPBB3-11769
 2013-08-23 23:53:33 +02:00
Joas Schilling
d717203af1 [ticket/11769] Fix language issues in the doc blocks 
PHPBB3-11769
 2013-08-23 23:49:11 +02:00
Joas Schilling
2845b153d8 [ticket/11769] Correctly supply the post author's username in posting.php 
Only supply the username, when it is a guest posting or we edit and it was
supplied, otherwise post_data might hold data of the post we quote, in which
case username is the original poster, not the current one.

PHPBB3-11769
 2013-08-23 23:17:52 +02:00
Andreas Fischer
5f81d66c2f [ticket/11799] Send anti abuse headers in "new password" emails. 
PHPBB3-11799
 2013-08-23 03:55:26 +02:00
Joas Schilling
b7b862d721 Merge remote-tracking branch 'rechosen/ticket/11792' into develop 
* rechosen/ticket/11792:
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
 2013-08-22 12:57:49 +02:00
rechosen
e113b46810 [ticket/11792] Add functional test for var lang_set_ext of core.user_setup 
To ensure that the new lang_set_ext variable available with the
core.user_setup event works properly, a functional test was added. It
overwrites the value of the 'SKIP' language key, which is assumed to remain
in use for some time to come.

PHPBB3-11792
 2013-08-22 11:06:04 +02:00
Andreas Fischer
fa2be427b6 Merge remote-tracking branch 'mvinny/ticket/11804' into develop 
* mvinny/ticket/11804:
  [ticket/11804] Remove </li> from overall_header which was not open
 2013-08-20 14:31:15 +02:00
Marcus Vinny
83092e0269 [ticket/11804] Remove </li> from overall_header which was not open 
PHPBB3-11804
 2013-08-20 04:25:06 -03:00
Andreas Fischer
edb0f61124 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11802] replace $browser with $user->browser

Conflicts:
	phpBB/download/file.php
 2013-08-20 00:50:58 +02:00
Andreas Fischer
7893e992ff Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11802] replace $browser with $user->browser
 2013-08-20 00:47:21 +02:00
Andreas Fischer
ba9d303d52 Merge remote-tracking branch 'dhruvgoel92/ticket/11802' into prep-release-3.0.12 
* dhruvgoel92/ticket/11802:
  [ticket/11802] replace $browser with $user->browser
 2013-08-20 00:46:33 +02:00
Dhruv
aa3d2ef7a9 [ticket/11802] replace $browser with $user->browser 
PHPBB3-11802
 2013-08-20 04:14:20 +05:30
Andreas Fischer
c6f56f5149 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11801] removed some whitespace and added missing semi colon's in css

Conflicts:
	phpBB/styles/prosilver/theme/colours.css
 2013-08-19 20:48:17 +02:00
Andreas Fischer
8c69db6ab2 Merge remote-tracking branch 'Prosk8er/ticket/11801' into develop-olympus 
* Prosk8er/ticket/11801:
  [ticket/11801] removed some whitespace and added missing semi colon's in css
 2013-08-19 20:45:34 +02:00
Dhruv
f7b967dc5a Merge remote-tracking branch 'Elsensee/ticket/11760' into develop 
# By Oliver Schramm
# Via Oliver Schramm
* Elsensee/ticket/11760:
  [ticket/11760] Use phpbb_version_compare() wrapper
 2013-08-19 23:28:53 +05:30
Prosk8er
f61db86b8d [ticket/11801] removed some whitespace and added missing semi colon's in css 
PHPBB3-11801
 2013-08-19 13:31:30 -04:00
rechosen
953ca1785f [ticket/11792] Add performance remark to core.user_setup event PHPDoc 
To prevent extension authors from loading all their translations globally, a
remark on this was added to the PHPDoc documentation of the core.user_setup
event.

PHPBB3-11792
 2013-08-19 11:06:36 +02:00
rechosen
88e5ba4e57 [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup 
To allow extensions to add global language strings just like mods can, add the
'lang_set_ext' variable to the core.user_setup event. It requires an ext_name
to be specified as well as a lang_set, and loads the specified lang_set in the
context of the extension.

PHPBB3-11792
 2013-08-19 11:06:36 +02:00
Andreas Fischer
3cc0a4149f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11789] Remove inline color in memberlist_view

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_view.html
 2013-08-18 17:10:26 +02:00
Andreas Fischer
78f1e11aeb Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus 
* cyberalien/ticket/11789:
  [ticket/11789] Remove inline color in memberlist_view
 2013-08-18 17:08:14 +02:00
Vjacheslav Trushkin
6f566fdaf0 [ticket/11789] Remove inline color in memberlist_view 
PHPBB3-11789
 2013-08-18 10:56:16 +03:00
Andreas Fischer
09f547e373 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11789] Remove colors from HTML code

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_history.html
 2013-08-18 03:07:32 +02:00
Andreas Fischer
20fb220b4f Merge remote-tracking branch 'cyberalien/ticket/11789' into develop-olympus 
* cyberalien/ticket/11789:
  [ticket/11789] Remove colors from HTML code
 2013-08-18 03:00:42 +02:00
Andreas Fischer
8fd49f9df8 Merge remote-tracking branch 'cyberalien/ticket/11796' into develop 
* cyberalien/ticket/11796:
  [ticket/11796] Replace pagination with pagination.html
 2013-08-18 02:50:32 +02:00
Andreas Fischer
5bb02647e6 Merge remote-tracking branch 'cyberalien/ticket/11779' into develop 
* cyberalien/ticket/11779:
  [ticket/11779] Fix unapproved messages class name
 2013-08-18 02:37:07 +02:00
Andreas Fischer
a808c4f9c9 Merge remote-tracking branch 'cyberalien/ticket/11800' into develop 
* cyberalien/ticket/11800:
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
 2013-08-18 02:02:44 +02:00
Andreas Fischer
55d911a2fd Merge remote-tracking branch 'cyberalien/ticket/11754' into develop 
* cyberalien/ticket/11754:
  [ticket/11754] Remove styleswitcher leftovers
 2013-08-18 01:55:56 +02:00
Dhruv
c54f1faf59 Merge remote-tracking branch 'VSEphpbb/ticket/11784' into develop 
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/11784:
  [ticket/11784] Remove naming redundancy for event listeners
 2013-08-18 01:09:33 +05:30
Vjacheslav Trushkin
9174788762 [ticket/11800] Fix scripts variable in subsilver simple_footer 
PHPBB3-11800
 2013-08-17 19:21:10 +03:00
Vjacheslav Trushkin
487822d12f [ticket/11800] Fix JavaScript in simple_footer.html 
Include forum_fn.js via INCLUDEJS
Move $SCRIPTS after footer event, allowing extensions to include scripts
Use correct template variable for including scripts

PHPBB3-11800
 2013-08-17 19:18:25 +03:00
Vjacheslav Trushkin
0ed7bd8a5b [ticket/11800] Remove forum_fn from memberlist_search.html 
PHPBB3-11800
 2013-08-17 19:17:17 +03:00
Andreas Fischer
772494af7e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
 2013-08-16 18:04:52 +02:00
Andreas Fischer
afb6800b59 Merge remote-tracking branch 'rechosen/ticket/11794' into develop-olympus 
* rechosen/ticket/11794:
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
 2013-08-16 18:02:09 +02:00
Vjacheslav Trushkin
87dd739a84 [ticket/11796] Replace pagination with pagination.html 
PHPBB3-11796
 2013-08-16 18:52:07 +03:00
rechosen
48f6f4559c [ticket/11794] Add missing array element commas to docs/coding-guidelines.html 
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.

PHPBB3-11794
 2013-08-16 17:48:36 +02:00
Andreas Fischer
96789df962 Merge remote-tracking branch 'cyberalien/ticket/11770' into develop 
* cyberalien/ticket/11770:
  [ticket/11770] Fix class name for pm list
 2013-08-15 02:24:17 +02:00
Andreas Fischer
1ac1b9b7ee Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
 2013-08-15 01:40:08 +02:00
Andreas Fischer
d089f9693a Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
 2013-08-15 01:37:56 +02:00
Andreas Fischer
b08928ee1c Merge remote-tracking branch 'nickvergessen/ticket/11775' into prep-release-3.0.12 
* nickvergessen/ticket/11775:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
 2013-08-15 01:37:40 +02:00
Joas Schilling
c30d4025d2 [ticket/11775] Fix doc blocks syntax 
PHPBB3-11775
 2013-08-15 01:36:38 +02:00
Joas Schilling
4b0adfcff5 [ticket/11775] Remove spaces at line ends 
PHPBB3-11775
 2013-08-15 01:35:02 +02:00
Vjacheslav Trushkin
9c299b0e83 [ticket/11789] Remove colors from HTML code 
PHPBB3-11789
 2013-08-14 19:09:27 +03:00
Matt Friedman
65d8cd6302 [ticket/11784] Remove naming redundancy for event listeners 
PHPBB3-11784
 2013-08-13 02:14:22 -07:00
Joas Schilling
63535b196d [ticket/11775] Split test into multiple steps 
PHPBB3-11775
 2013-08-12 15:38:20 +02:00