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
23,637 Commits 17 Branches 190 Tags
Commit Graph

20221 Commits

Author SHA1 Message Date
Marc Alexander
2634db6031 Merge branch 'develop-ascraeus' into develop 2014-09-14 20:45:11 +02:00
Cesar G
b71571b793 [ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor. 
PHPBB3-13065
 2014-09-14 10:04:18 -07:00
Cesar G
4250c75de1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
 2014-09-14 07:40:52 -07:00
Cesar G
a45df1d840 Merge remote-tracking branch 'prototech/ticket/13040' into develop-ascraeus 
* prototech/ticket/13040:
  [ticket/13040] Fix W3C validator warning in overall_footer.html
 2014-09-14 07:40:30 -07:00
John
e4401b2534 [ticket/13040] Fix W3C validator warning in overall_footer.html 
Added a non-breaking space to remove the following warning:
**Empty heading.**

```html
<h3 class="alert_title"></h3><p class="alert_text"></p>
```

PHPBB3-13040
 2014-09-14 06:30:03 -07:00
Cesar G
2566cf1499 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13058] Add min value to jump to page input
  [ticket/13009] Remove legacy browser hacks
 2014-09-14 06:26:32 -07:00
Cesar G
ca7168ee4a Merge remote-tracking branch 'hanakin/ticket/13009' into develop-ascraeus 
* hanakin/ticket/13009:
  [ticket/13009] Remove legacy browser hacks
 2014-09-14 06:23:00 -07:00
Cesar G
7f86b6e71e Merge remote-tracking branch 'Nicofuma/ticket/13058' into develop-ascraeus 
* Nicofuma/ticket/13058:
  [ticket/13058] Add min value to jump to page input
 2014-09-14 06:21:25 -07:00
Louis7777
2cf5b848db [ticket/13058] Add min value to jump to page input 
PHPBB3-13058
 2014-09-13 22:44:37 +02:00
Marc Alexander
08d16cf7c9 Merge branch 'develop-ascraeus' into develop 2014-09-12 19:54:34 +02:00
Marc Alexander
48dbef391b Merge pull request #2879 from callumacrae/ticket/12982 
[ticket/12982] JS refactoring
 2014-09-12 19:54:03 +02:00
Andreas Fischer
93fbc468fb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12734] Remove unnecessary error supressing
 2014-09-12 00:54:51 +02:00
Andreas Fischer
f26b6b6251 Merge pull request #2941 from Senky/ticket/12734 
[ticket/12734] Custom profile manager should not suppress errors when inserting user rows

* Senky/ticket/12734:
  [ticket/12734] Remove unnecessary error supressing
 2014-09-12 00:54:51 +02:00
Andreas Fischer
f73e60935d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
 2014-09-12 00:52:24 +02:00
Tristan Darricau
7b4c5bdd34 [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php 
PHPBB3-13057
 2014-09-11 22:01:09 +02:00
hanakin
7618e0387c [ticket/13009] Remove legacy browser hacks 
PHPBB3-13009
 2014-09-11 17:33:30 +02:00
Tristan Darricau
dd2a643e65 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13005] Add event to display_forums() to modify category template data
 2014-09-11 16:59:38 +02:00
Tristan Darricau
7d6ceb81c1 Merge pull request #2901 from rxu/ticket/13005 
[ticket/13005] Add event to display_forums() to modify category template data

* rxu/ticket/13005:
  [ticket/13005] Add event to display_forums() to modify category template data
 2014-09-11 16:58:34 +02:00
Tristan Darricau
d1c4e0d63c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
 2014-09-11 16:44:57 +02:00
Tristan Darricau
5804e43589 Merge pull request #2903 from rxu/ticket/13006 
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event

* rxu/ticket/13006:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
 2014-09-11 16:44:16 +02:00
Andreas Fischer
2c7fbb9e61 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13042] Remove unused variables
 2014-09-10 22:17:18 +02:00
Andreas Fischer
d42401056c Merge pull request #2940 from Senky/ticket/13042 
[ticket/13042] Unused var in login_box()

* Senky/ticket/13042:
  [ticket/13042] Remove unused variables
 2014-09-10 22:17:17 +02:00
Tristan Darricau
d465e7e438 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html
 2014-09-10 20:02:20 +02:00
Tristan Darricau
c842583bbf Merge pull request #2936 from nickvergessen/ticket/12976 
[ticket/12976] Correctly use plurals for attachment count in UCP navigation

* nickvergessen/ticket/12976:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation
 2014-09-10 20:00:52 +02:00
Jakub Senko
fcd2a2f186 [ticket/12734] Remove unnecessary error supressing 
PHPBB3-12734
 2014-09-10 18:37:16 +02:00
Jakub Senko
51f5c2d094 [ticket/13042] Remove unused variables 
PHPBB3-13042
 2014-09-10 17:38:05 +02:00
Tristan Darricau
d320897180 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13052] Restore timespan parameter for check_form_key()
 2014-09-10 11:50:28 +02:00
Callum Macrae
cb7e1540c6 [ticket/12982] Refactoring: Killed undescriptive variables 
PHPBB3-12982
 2014-09-10 09:58:46 +01:00
Joas Schilling
d87547da66 [ticket/13052] Restore timespan parameter for check_form_key() 
PHPBB3-13052
 2014-09-10 08:07:21 +02:00
Marc Alexander
d1b7408bf0 Merge branch 'develop-ascraeus' into develop 2014-09-09 23:37:54 +02:00
Marc Alexander
6c0a3bb247 Merge pull request #2934 from VSEphpbb/ticket/13051 
[ticket/13051] Fix viewonline event (recently broken) and add a new core event
 2014-09-09 23:37:30 +02:00
Matt Friedman
0fc5a27889 [ticket/13051] Fix core event name 
PHPBB3-13051
 2014-09-09 13:12:29 -07:00
Matt Friedman
0861404121 [ticket/13051] Rename new event core.viewonline_modify_user_row 
PHPBB3-13051
 2014-09-09 12:52:53 -07:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation 
PHPBB3-12976
 2014-09-09 21:31:34 +02:00
Andreas Fischer
aa6d7a09b8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
 2014-09-09 21:25:21 +02:00
Andreas Fischer
65026ed1fa Merge pull request #2935 from nickvergessen/ticket/13052 
Ticket/13052 Remove additional parameter from check_form_key()

* nickvergessen/ticket/13052:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
 2014-09-09 21:25:15 +02:00
Joas Schilling
ef61deb132 [ticket/13052] Use request class instead of $_POST and request_var() 
PHPBB3-13052
 2014-09-09 19:49:17 +02:00
Joas Schilling
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters 
PHPBB3-13052
 2014-09-09 19:47:00 +02:00
Joas Schilling
047728e3d4 [ticket/13052] Remove additional parameter from check_form_key() 
PHPBB3-13052
 2014-09-09 19:46:27 +02:00
Matt Friedman
c56c0fce0d [ticket/13051] Add a new core event to handle the template array 
PHPBB3-13051
 2014-09-09 09:14:32 -07:00
Matt Friedman
c6fc455432 [ticket/13051] Fix viewonline event, remove template data 
PHPBB3-13051
 2014-09-08 15:54:16 -07:00
Andreas Fischer
33762db175 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Andreas Fischer
e00697f3a1 Merge pull request #2926 from Senky/ticket/13038 
[ticket/13038] Link user post tally to their posts

* Senky/ticket/13038:
  [ticket/13038] Add link to number of posts of user in viewtopic
 2014-09-08 22:12:44 +02:00
Andreas Fischer
869cff6ace Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13050] Allow topic/forum subscription when email/jabber is off
 2014-09-08 21:23:46 +02:00
Andreas Fischer
3458aa2482 Merge pull request #2931 from rxu/ticket/13050 
[ticket/13050] Allow topic/forum subscription when email/jabber is off

* rxu/ticket/13050:
  [ticket/13050] Allow topic/forum subscription when email/jabber is off
 2014-09-08 21:23:46 +02:00
Jakub Senko
aefd96e604 [ticket/13038] Add link to number of posts of user in viewtopic 
PHPBB3-13038
 2014-09-08 17:36:08 +02:00
Marc Alexander
5df5b9c2d5 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:47:43 +02:00
Marc Alexander
bcd4cebd48 Merge pull request #2915 from rxu/ticket/13026 
[ticket/13026] Add template vars array to core.viewonline_overwrite_location
 2014-09-08 16:46:26 +02:00
Marc Alexander
8a568a77f6 Merge branch 'develop-ascraeus' into develop 2014-09-08 16:30:31 +02:00
Marc Alexander
cc96bcff99 Merge pull request #2911 from rxu/ticket/13020 
[ticket/13020] Add variables to core.viewforum_get_topic_data event
 2014-09-08 16:30:05 +02:00