mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
18,809 Commits 17 Branches 190 Tags
Commit Graph

16544 Commits

Author SHA1 Message Date
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
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
Joseph Warner
83515cd3d4 [feature/oauth] Fix remaining issues with token storage 
PHPBB3-11673
 2013-08-15 01:14:53 -04:00
Joseph Warner
e2d0a0b7c8 [feature/oauth] Fix template not refreshing issue 
PHPBB3-11673
 2013-08-14 23:18:10 -04:00
Joseph Warner
0ea3103a44 [feature/oauth] Don't allow external login methods on admin auth 
PHPBB3-11673
 2013-08-14 23:01:03 -04:00
Joseph Warner
43e08e221f [feature/oauth] Fix bug found in testing 
PHPBB3-11673
 2013-08-14 22:50:49 -04: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
Joseph Warner
0ea555bbc7 [feature/oauth] Update auth provider interface 
PHPBB3-11673
 2013-08-14 17:16:00 -04:00
Joseph Warner
d13a1788f0 [feature/oauth] Update language constants for ucp_auth_link 
PHPBB3-11673
 2013-08-14 17:08:08 -04:00
Joseph Warner
59c8db28d6 [feature/oauth] Always store session_id with token 
PHPBB3-11673
 2013-08-14 17:01:33 -04:00
Joseph Warner
823b7e2b84 [feature/oauth] Fix small error in method call 
PHPBB3-11673
 2013-08-14 16:59:01 -04:00
Joseph Warner
abebe83edb [feature/oauth] No need for this line 
PHPBB3-11673
 2013-08-14 16:52:55 -04:00
Joseph Warner
7bd4c88ec5 [feature/oauth] Fix errors in oauth 
PHPBB3-11673
 2013-08-14 16:45:31 -04:00
Joseph Warner
9cd80345ad [feature/oauth] Implement unlinking in OAuth 
PHPBB3-11673
 2013-08-14 16:33:10 -04:00
Joseph Warner
a2237ea8a7 [feature/oauth] Add unlink_account to auth interface 
PHPBB3-11673
 2013-08-14 16:21:06 -04:00
Joseph Warner
9c91446ef7 [feature/oauth] Document internal functions 
PHPBB3-11673
 2013-08-14 16:07:38 -04:00
Joseph Warner
cd12786e58 [feature/oauth] Fix errors found in testing linking 
PHPBB3-11673
 2013-08-14 16:02:47 -04:00
Joseph Warner
bb68338861 [feature/oauth] Refactor oauth::link_account for two paths 
PHPBB3-11673
 2013-08-14 15:55:58 -04:00
Joseph Warner
afebbf231a [feature/oauth] Update link_account to allow for two methods of linking 
PHPBB3-11673
 2013-08-14 15:36:20 -04:00
Joseph Warner
ce387d9bfc [feature/oauth] Fix errors in ucp_auth_link 
PHPBB3-11673
 2013-08-14 15:21:24 -04:00
Joseph Warner
67b1ec5bb8 [feature/oauth] Start implementing link/unlink actions 
PHPBB3-11673
 2013-08-14 15:19:40 -04:00
Vjacheslav Trushkin
9c299b0e83 [ticket/11789] Remove colors from HTML code 
PHPBB3-11789
 2013-08-14 19:09:27 +03:00
rechosen
564a7cc89d [ticket/11786] Further improve wording in phpbb/notification/type/quote.php 
Further improve wording in phpbb/notification/type/quote.php per suggestion of
imkingdavid.

PHPBB3-11786
 2013-08-13 17:05:55 +02:00
rechosen
ef4eda3855 [ticket/11786] s/@return void/@return null in content_visibility.php 
The file phpbb/content_visibility.php still contained a few instances of
'@return void' in its PHPDoc blocks, fixed. Thanks to JoshyPHP for reporting.

PHPBB3-11786
 2013-08-13 16:56:04 +02:00
rechosen
e2014ab76e [ticket/11786] Fix PHPDoc documentation of a few events 
Fixed some PHPDoc errors I noticed while working on the karma extension.
Mostly spacing issues or omitted characters, though there was one description
that made no sense at all.

PHPBB3-11786
 2013-08-13 16:23:54 +02:00
rechosen
a92669994b [ticket/11786] Fix typo and ugly English in the notification system PHPDoc 
The notification system contained two PHPDoc lines that needed improvement.

PHPBB3-11786
 2013-08-13 16:20:45 +02:00
Matt Friedman
65d8cd6302 [ticket/11784] Remove naming redundancy for event listeners 
PHPBB3-11784
 2013-08-13 02:14:22 -07:00
Joseph Warner
836d3ba22e [feature/oauth] Handle hidden fields 
PHPBB3-11673
 2013-08-12 15:29:22 -04:00
Joseph Warner
4003e077c1 [feature/oauth] Get the OAuth template in place for ucp_auth_link 
PHPBB3-11673
 2013-08-12 14:43:35 -04:00
Joseph Warner
e04844c95f [feature/oauth] Build OAuth data for ucp_auth_link 
PHPBB3-11673
 2013-08-12 13:18:00 -04:00
Joseph Warner
a479f919ff [feature/oauth] Error handling on page 
PHPBB3-11673
 2013-08-12 12:53:22 -04:00
Joas Schilling
585f692e31 Merge pull request #1643 from rechosen/ticket/11777 
[ticket/11777] Search for template listeners in the php event listeners way
 2013-08-12 06:37:47 -07:00
Andreas Fischer
f6c6122eed Merge remote-tracking branch 'cyberalien/ticket/11781' into develop 
* cyberalien/ticket/11781:
  [ticket/11781] Include func update_post_information()
 2013-08-12 12:57:43 +02:00
rechosen
08e6c61180 [ticket/11777] Require a suffix of '_listener' on extension template listeners 
To further mirror the file name and location requirements for php template
event listeners, require extension template event listener files to follow the
'<event name>_listener.html' naming format.

PHPBB3-11777
 2013-08-12 09:59:11 +02:00
rechosen
7f76c9f9c7 [ticket/11777] Rename the extension template listener subdirectory to 'event/' 
Per suggestion of EXreaction and nickvergessen, do not look for extension
template event listeners in styles/[style]/template/events/ but in
styles/[style]/template/event/ (without the trailing 's') to match the way
phpBB looks for php template event listeners.

PHPBB3-11777
 2013-08-12 09:59:11 +02:00