makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
24048 commits 18 branches 192 tags 207 MiB
Commit graph

24048 commits

This branch
This branch
All branches
Author SHA1 Message Date
PayBas
da716058fa [ticket/10472] Fix ACP overflow:hidden problem for medium-sized screens 
PHPBB3-10472
 2014-09-15 14:53:03 +02:00
PayBas
5a780dfab1 [ticket/12408] Clarify the behavior of "override style" 
PHPBB3-12408
 2014-09-15 14:49:56 +02:00
PayBas
aaddf41e5b [ticket/12408] Changed lang vars, added fieldset and removed "default" 
PHPBB3-12408
 2014-09-15 14:43:40 +02:00
PayBas
0b4944f125 [ticket/12408] Public functions and updated doc block 
PHPBB3-12408
 2014-09-15 14:43:40 +02:00
PayBas
60c9955f51 [ticket/12408] Code cleanup 
Rebased to see if travis will finally play along

PHPBB3-12408
 2014-09-15 14:43:39 +02:00
PayBas
ae63843647 [ticket/12408] Simplified queries 
PHPBB3-12408
 2014-09-15 14:43:38 +02:00
PayBas
265c621c9e [ticket/12408] Add quick setting for "default guest style" to ACP 
PHPBB3-12408
 2014-09-15 14:43:38 +02:00
Cesar G
5034b3ad7d [ticket/13018] Reduce the delta further. 
The callback does not actually do anything when cancelling the confirmation
box so we can avoid calling it altogether when cancel is clicked.

PHPBB3-13018
 2014-09-14 15:49:18 -07:00
Cesar G
6d80770ba4 [ticket/13018] Remove duplicate logic in confirm box and alert box handling. 
This ensures a more consistent handling of the various closing/opening actions
and fixes some bugs where certain event handlers are not turned off in certain
instances.

PHPBB3-13018
 2014-09-14 14:54:08 -07:00
Tristan Darricau
b9e7ed004c [ticket/13034] Use utf8_basename 
PHPBB3-13034
 2014-09-14 23:41:15 +02:00
Tristan Darricau
1507c5af64 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
 2014-09-14 22:07:52 +02:00
Tristan Darricau
9ef01e7f82 Merge pull request #2956 from prototech/ticket/13019 
[ticket/13019] Always accept a reason for deleting a post/topic.

* prototech/ticket/13019:
  [ticket/13019] Do not hide reason field when deleting permanently.
  [ticket/13019] Rename deletion reason label.
  [ticket/13019] Always accept a reason for deleting a post/topic.
 2014-09-14 22:00:16 +02:00
Marc Alexander
2634db6031 Merge branch 'develop-ascraeus' into develop 2014-09-14 20:45:11 +02:00
Marc Alexander
1487e6f857 Merge pull request #2955 from prototech/ticket/13065 
[ticket/13065] Fix rehashing of stored password hash in phpBB2 convertor.
 2014-09-14 20:44:49 +02:00
Cesar G
ffe24d5b8f [ticket/13019] Do not hide reason field when deleting permanently. 
PHPBB3-13019
 2014-09-14 10:41:57 -07:00
Cesar G
8c11927b55 [ticket/13019] Rename deletion reason label. 
PHPBB3-13019
 2014-09-14 10:39:25 -07:00
Cesar G
bf7041eeb9 [ticket/13019] Always accept a reason for deleting a post/topic. 
PHPBB3-13019
 2014-09-14 10:38:56 -07: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
rxu
bf6bc330af [ticket/13066] Add search results core event to modify search title 
PHPBB3-13066
 2014-09-14 15:00:47 +08:00
Tristan Darricau
46a9fe93d7 [ticket/13064] Validate the migrations provided to migrator::set_migrations() 
PHPBB3-13064
 2014-09-14 00:56:41 +02:00
Louis7777
2cf5b848db [ticket/13058] Add min value to jump to page input 
PHPBB3-13058
 2014-09-13 22:44:37 +02:00
rxu
e731dcfe6e [ticket/13062] Add viewforum.php core event to modify topic ids sql query 
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45383

PHPBB3-13062
 2014-09-14 01:04:34 +08:00
Tristan Darricau
c988b98ac6 [ticket/13061] Replace the service event.subscriber_loader by a compiler pass 
PHPBB3-13061
 2014-09-13 14:34:18 +02:00
Tristan Darricau
3dc73485ee [ticket/13056] Move the arguments of the request class to the DI 
PHPBB3-13056
 2014-09-13 14:22:55 +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
Andreas Fischer
f892646a84 Merge pull request #2944 from Nicofuma/ticket/13057 
[ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php

* Nicofuma/ticket/13057:
  [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
 2014-09-12 00:52:22 +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
Tristan Darricau
04e0d305d0 [ticket/12963] Add unit tests 
PHPBB3-12963
 2014-09-10 19:22:00 +02:00
Tristan Darricau
72ee4b3a7c [ticket/12963] Load extensions migrations from /migration 
PHPBB3-12963
 2014-09-10 19:21:57 +02:00
Tristan Darricau
ff872a7970 [ticket/12963] Don't use static var in \extension\base\get_migration_file_list 
The static var was global to all instance of \phpbb\base and so if two
different instances (for two different extensions) were created by the
same script they shared the same migrations list.

PHPBB3-12963
 2014-09-10 19:21:55 +02:00
Jakub Senko
fcd2a2f186 [ticket/12734] Remove unnecessary error supressing 
PHPBB3-12734
 2014-09-10 18:37:16 +02:00