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

22039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cesar G
386aac3a85 Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeus 
* VSEphpbb/ticket/10521:
  [ticket/10521] Fix broken tests using set_cookie
 2014-05-02 17:55:57 -07:00
Matt Friedman
b07ea805d4 [ticket/10521] Fix broken tests using set_cookie 
PHPBB3-10521
 2014-05-02 17:33:40 -07:00
Matt Friedman
47ff63f823 [ticket/12484] Add template event ucp_agreement_terms_before/after 
PHPBB3-12484
 2014-05-02 16:41:40 -07:00
Nils Adermann
5b39b9f52a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/10521] Update docblock of set_cookie for new HttpOnly param
 2014-05-03 01:00:06 +02:00
Nils Adermann
57927ef8ea Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus 
* github-vse/ticket/10521:
  [ticket/10521] Update docblock of set_cookie for new HttpOnly param
 2014-05-03 00:59:55 +02:00
Matt Friedman
6d71f7d7ba [ticket/10521] Update docblock of set_cookie for new HttpOnly param 
PHPBB3-10521
 2014-05-02 15:57:39 -07:00
Nils Adermann
2280a37a3e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12429] Can not insert into more columns than exist.
 2014-05-03 00:51:38 +02:00
Nils Adermann
5800532264 Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develop-ascraeus 
* github-bantu/ticket/12429-ascraeus:
  [ticket/12429] Can not insert into more columns than exist.
 2014-05-03 00:51:31 +02:00
Nils Adermann
48d016134e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:39 +02:00
Andreas Fischer
6cfee5f2c2 [ticket/12429] Can not insert into more columns than exist. 
PHPBB3-12429
 2014-05-03 00:37:31 +02:00
Nils Adermann
c7baeaa912 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:28 +02:00
Nils Adermann
af7ec71967 Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympus 
* github-bantu/ticket/11860:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:11 +02:00
Joas Schilling
184b8c2df7 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12382] Event loop nesting inclusion applies to regular includes too
  [ticket/12382] Allow nested loops in included files.
 2014-05-03 00:23:05 +02:00
Joas Schilling
a995f1166c Merge pull request #2391 from naderman/ticket/12382 
[ticket/12382] Allow nested loops in included files.
 2014-05-03 00:21:50 +02:00
Nils Adermann
c5660ed177 [ticket/12382] Event loop nesting inclusion applies to regular includes too 
PHPBB3-12382
 2014-05-03 00:20:37 +02:00
Nils Adermann
93388eb431 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/10521] Allow language switching by URL parameter
 2014-05-03 00:15:54 +02:00
Nils Adermann
1399d60954 Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus 
* github-vse/ticket/10521:
  [ticket/10521] Allow language switching by URL parameter
 2014-05-03 00:15:28 +02:00
Nils Adermann
d18f19a3bb [ticket/12382] Allow nested loops in included files. 
They have to reference the fully qualified loop name in BEGIN and END.

PHPBB3-12382
 2014-05-03 00:13:06 +02:00
Andreas Fischer
af74bbc81c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12482] Fixed undefined variable: data.
 2014-05-02 23:32:14 +02:00
Andreas Fischer
936518d201 Merge pull request #2389 from prototech/ticket/12482 
[ticket/12482] Fixed undefined variable: data.

* prototech/ticket/12482:
  [ticket/12482] Fixed undefined variable: data.
 2014-05-02 23:32:14 +02:00
Matt Friedman
257ff46659 [ticket/10521] Allow language switching by URL parameter 
PHPBB3-10521
 2014-05-02 14:22:59 -07:00
Cesar G
68f4e84e62 [ticket/12482] Fixed undefined variable: data. 
PHPBB3-12482
 2014-05-02 14:22:16 -07:00
Joas Schilling
3e2d08bb31 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12478] Add contact field events to viewtopic_body.html.
  [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.
 2014-05-02 23:13:51 +02:00
Joas Schilling
0d133e483b Merge pull request #2385 from prototech/ticket/12478 
Add contact field before/after events.
 2014-05-02 23:12:10 +02:00
Andreas Fischer
9eac15707e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12480] Remove unused use statements
  [ticket/12480] Add subfolder/config/routing.yml which should not be found
  [ticket/12480] Only load config/routing.yml from extensions route
 2014-05-02 23:04:58 +02:00
Andreas Fischer
56f881953d Merge pull request #2388 from nickvergessen/ticket/12480 
[ticket/12480] Only load config/routing.yml from extensions route

* nickvergessen/ticket/12480:
  [ticket/12480] Remove unused use statements
  [ticket/12480] Add subfolder/config/routing.yml which should not be found
  [ticket/12480] Only load config/routing.yml from extensions route
 2014-05-02 23:04:33 +02:00
Joas Schilling
ed089f4b5f [ticket/12480] Remove unused use statements 
PHPBB3-12480
 2014-05-02 22:52:20 +02:00
Joas Schilling
a470b6c519 [ticket/12480] Add subfolder/config/routing.yml which should not be found 
PHPBB3-12480
 2014-05-02 22:48:28 +02:00
Joas Schilling
10b23612e3 [ticket/12480] Only load config/routing.yml from extensions route 
PHPBB3-12480
 2014-05-02 22:35:36 +02:00
Andreas Fischer
c33cb67ec9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12477] Tab instead of spaces.
  [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
 2014-05-02 22:16:11 +02:00
Andreas Fischer
dbb7552614 Merge pull request #2384 from prototech/ticket/12477 
[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.

* prototech/ticket/12477:
  [ticket/12477] Tab instead of spaces.
  [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
 2014-05-02 22:16:06 +02:00
Cesar G
0684d9c689 [ticket/12477] Tab instead of spaces. 
PHPBB3-12477
 2014-05-02 13:05:31 -07:00
Cesar G
a4a7fcb93d [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's. 
PHPBB3-12477
 2014-05-02 13:05:25 -07:00
Cesar G
9431a018cb [ticket/12478] Add contact field events to viewtopic_body.html. 
PHPBB3-12478
 2014-05-02 12:50:59 -07:00
Cesar G
f34af2669d [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html. 
PHPBB3-12478
 2014-05-02 12:50:16 -07:00
Nils Adermann
64a34a1966 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:43:43 +02:00
Nils Adermann
603c3b4629 Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develop-ascraeus 
* github-bantu/ticket/12429-ascraeus:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:43:33 +02:00
Nils Adermann
7b94368d52 Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympus 
* github-bantu/ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:42:54 +02:00
Nils Adermann
45215d0bda Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12254] Add subsilver2 support for cookie storage instead of SID
  [ticket/12254] Use a cookie instead of SID to store language selection
  [ticket/12254] No longer need to add change_lang to the URL params
  [ticket/12254] Use 'language' instead of 'set_lang' as the variable name
  [ticket/12254] Persist set_lang after reg only if changed from default
  [ticket/12254] Add set_lang var changes to subsilver2 files
  [ticket/12254] Use new set_lang var to avoid conflict with change_lang
  [ticket/12254] Stop using deprecated request_var in user class
  [ticket/12254] Better language switching on registration page
 2014-05-02 21:24:15 +02:00
Nils Adermann
0fc6b6ac36 Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeus 
* github-vse/ticket/12254:
  [ticket/12254] Add subsilver2 support for cookie storage instead of SID
  [ticket/12254] Use a cookie instead of SID to store language selection
  [ticket/12254] No longer need to add change_lang to the URL params
  [ticket/12254] Use 'language' instead of 'set_lang' as the variable name
  [ticket/12254] Persist set_lang after reg only if changed from default
  [ticket/12254] Add set_lang var changes to subsilver2 files
  [ticket/12254] Use new set_lang var to avoid conflict with change_lang
  [ticket/12254] Stop using deprecated request_var in user class
  [ticket/12254] Better language switching on registration page
 2014-05-02 21:23:58 +02:00
Matt Friedman
5b0b0d7c66 [ticket/12254] Add subsilver2 support for cookie storage instead of SID 
PHPBB3-12254
 2014-05-02 12:10:59 -07:00
Matt Friedman
78325736b1 [ticket/12254] Use a cookie instead of SID to store language selection 
PHPBB3-12254
 2014-05-02 12:08:35 -07:00
Andreas Fischer
0cee35aeef Merge branch 'ticket/12429' into ticket/12429-develop 
* ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2014-05-02 20:28:58 +02:00
Andreas Fischer
30dc3afb69 [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3. 
PHPBB3-12429
 2014-05-02 20:19:10 +02:00
Nils Adermann
49c994f0f3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12475] Tabs, spaces, ...
 2014-05-02 20:05:14 +02:00
Nils Adermann
03594b6443 [ticket/12475] Tabs, spaces, ... 
PHPBB3-12475
 2014-05-02 20:03:40 +02:00
Nils Adermann
aace88b80d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12475] Load extension migrations on cli updater too
 2014-05-02 19:55:59 +02:00
Nils Adermann
3420f8f320 [ticket/12475] Load extension migrations on cli updater too 
PHPBB3-12475
 2014-05-02 19:55:19 +02:00
Andreas Fischer
237ae5dfae Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12475] Error in db:update console command
  [ticket/12474] Error messages should be displayed with <error> tag
 2014-05-02 19:50:16 +02:00
Andreas Fischer
ab1c181620 Merge pull request #2381 from Nicofuma/ticket/12475 
[ticket/12475] Undefined variable $log in db:migrate console command

* Nicofuma/ticket/12475:
  [ticket/12475] Error in db:update console command
 2014-05-02 19:50:05 +02:00