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

26552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
46ffafd0c6 Merge branch '3.1.x' 2015-08-08 22:17:29 +02:00
Marc Alexander
3dcba7000b Merge pull request #3757 from Zoddo/ticket/14006 
[ticket/14006] Add core.ucp_register_agreement event
 2015-08-08 22:17:21 +02:00
Máté Bartus
962fb6b19b Merge pull request #3819 from Nicofuma/ticket/14079 
[ticket/14079] Correctly mark notifications as read
 2015-08-08 19:53:34 +02:00
Tristan Darricau
05d583bba7 [ticket/14079] Correctly mark notifications as read 
PHPBB3-14079
 2015-08-08 19:18:18 +02:00
Máté Bartus
ec270713d0 Merge pull request #3817 from Nicofuma/ticket/14076 
[ticket/14076] Fix notification settings
 2015-08-07 16:39:55 +02:00
Tristan Darricau
7e62b3a4b0 [ticket/14076] Fix notification settings 
PHPBB3-14076
 2015-08-07 16:38:53 +02:00
Máté Bartus
e4e3f595ec Merge pull request #3816 from Nicofuma/ticket/14074 
[ticket/14074] Fix mark notifications as read in the ucp
 2015-08-07 16:34:15 +02:00
Tristan Darricau
2260533d47 [ticket/14074] Fix mark notifications as read in the ucp 
PHPBB3-14074
 2015-08-07 16:14:40 +02:00
Marc Alexander
b55361e89b Merge remote-tracking branch 'Nicofuma/ticket/12692' 2015-08-07 10:07:45 +02:00
Tristan Darricau
618065ec16 [ticket/12692] Fix tests and update style 
PHPBB3-12692
 2015-08-06 13:26:14 +02:00
Andreas Fischer
4aac578908 Merge pull request #3782 from RMcGirr83/ticket/13711 
[ticket/13711] Notifications are sent to inactive users

* RMcGirr83/ticket/13711:
  [ticket/13711] Notifications are sent to inactive users
 2015-08-05 13:45:02 +02:00
Andreas Fischer
452c8bef28 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13711] Notifications are sent to inactive users
 2015-08-05 13:45:02 +02:00
Andreas Fischer
50cf610eb6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14049] Use headers from config when sending Plupload delete request.
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
 2015-08-05 13:41:59 +02:00
Andreas Fischer
b34e74254a Merge pull request #3790 from prototech/ticket/14010 
[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.

* prototech/ticket/14010:
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
 2015-08-05 13:40:40 +02:00
Andreas Fischer
e7c6c3f02b Merge pull request #3791 from prototech/ticket/14049 
[ticket/14049] Use headers from config when sending Plupload delete request.

* prototech/ticket/14049:
  [ticket/14049] Use headers from config when sending Plupload delete request.
 2015-08-05 13:39:44 +02:00
Tristan Darricau
cbe74844b0 Merge pull request #3698 from s9e/ticket/13935 
[ticket/13935] Allow more admin-configurable schemes in post links

* s9e/ticket/13935:
  [ticket/13935] Removed cache invalidation from acp_board
  [ticket/13935] Removed UI
  [ticket/13935] Allow more admin-configurable schemes in post links
 2015-08-05 12:59:55 +02:00
Tristan Darricau
e70373a820 Merge pull request #3799 from CHItA/ticket/14056 
[ticket/14056] Keep install schema resources in the install folder

* CHItA/ticket/14056:
  [ticket/14056] Fix remaining schema path
  [ticket/14056] Keep install schema resources in the install folder
 2015-07-30 09:58:34 +02:00
Mate Bartus
4ae83e4266 [ticket/14056] Fix remaining schema path 
PHPBB3-14056
 2015-07-29 22:08:37 +02:00
Mate Bartus
6eb284b23a [ticket/14056] Keep install schema resources in the install folder 
PHPBB3-14056
 2015-07-29 20:24:52 +02:00
Tristan Darricau
979e125c7c Merge pull request #3795 from CHItA/ticket/14053 
[ticket/14053] Fix tests for installer config

* CHItA/ticket/14053:
  [ticket/14053] Fix tests for installer config
 2015-07-27 16:13:54 +02:00
Mate Bartus
172b021c89 [ticket/14053] Fix tests for installer config 
@covers annotations causing build failures on bamboo, so removed them

PHPBB3-14053
 2015-07-27 16:04:34 +02:00
Máté Bartus
3cfaa61560 Merge pull request #3793 from Nicofuma/ticket/14052 
[ticket/14052] Translate installer commands
 2015-07-27 13:55:55 +02:00
RMcGirr83
771090f13e [ticket/13711] Notifications are sent to inactive users 
PHPBB3-13711
 2015-07-27 06:27:25 -04:00
Tristan Darricau
6499a8a6c0 [ticket/14052] Translate installer commands 
PHPBB3-14052
 2015-07-27 11:40:12 +02:00
Tristan Darricau
a0258ae25c Merge pull request #3514 from CHItA/ticket/13740 
[ticket/13740] Refactoring installer

* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ...
 2015-07-27 11:24:43 +02:00
Mate Bartus
11dfe503aa [ticket/13740] Reduce number of references in nav provider 
PHPBB3-13740
 2015-07-26 23:00:40 +02:00
Mate Bartus
495c0c6fb3 [ticket/13740] Move handle_language_select calls to the controllers 
PHPBB3-13740
 2015-07-26 22:20:32 +02:00
Cesar G
ff67a09724 [ticket/14049] Use headers from config when sending Plupload delete request. 
PHPBB3-14049
 2015-07-25 18:56:19 -07:00
Cesar G
edf81e8de8 [ticket/14010] Update Plupload from 2.1.2 to 2.1.8. 
PHPBB3-14010
 2015-07-25 18:54:09 -07:00
Mate Bartus
f7641cd506 [ticket/13740] Fix infinite config.php check loop 
PHPBB3-13740
 2015-07-25 15:41:10 +02:00
Mate Bartus
0befa9f109 [ticket/13740] Move default data settings out of constructors 
PHPBB3-13740
 2015-07-25 14:44:39 +02:00
Mate Bartus
e8e9193690 [ticket/13740] Deduplicate container builder's checks 
PHPBB3-13740
 2015-07-25 14:43:54 +02:00
Mate Bartus
723337d2f6 [ticket/13740] Use JSON for installer config 
PHPBB3-13740
 2015-07-25 14:42:37 +02:00
Mate Bartus
04186e8498 [ticket/13740] Fix comment 
PHPBB3-13740
 2015-07-25 14:42:17 +02:00
Mate Bartus
be7e1ba7a0 [ticket/13740] Use language service in console application 
PHPBB3-13740
 2015-07-24 18:05:10 +02:00
Mate Bartus
fc46dec813 [ticket/13740] Fix CS in compatibilty_globals.php 
PHPBB3-13740
 2015-07-24 17:36:04 +02:00
Mate Bartus
0d88b3f9e9 [ticket/13740] Fix message element creation in JS 
PHPBB3-13740
 2015-07-24 11:06:50 +02:00
Mate Bartus
b4552a8ba3 [ticket/13740] Replace more spaces with tabs 
PHPBB3-13740
 2015-07-24 08:33:02 +02:00
Mate Bartus
22786a5b6f [ticket/13740] Fix CS 
PHPBB3-13740
 2015-07-24 02:37:00 +02:00
Mate Bartus
cb593c0e04 [ticket/13740] Filter basic directory change attempts in lang change 
PHPBB3-13740
 2015-07-24 00:04:40 +02:00
Mate Bartus
27d2d58e05 [ticket/13740] Use tabs instead of spaces in JS file 
PHPBB3-13740
 2015-07-23 23:46:36 +02:00
Mate Bartus
3840882b93 [ticket/13740] Add success message when install finished 
PHPBB3-13740
 2015-07-23 23:35:20 +02:00
Mate Bartus
115029b601 [ticket/13740] Fix $script_path in obtain_data 
PHPBB3-13740
 2015-07-23 23:23:06 +02:00
Mate Bartus
e08f134112 [ticket/13740] Fix is_phpbb_installed() method 
PHPBB3-13740
 2015-07-23 22:55:31 +02:00
Mate Bartus
0e3b7e2de6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13982] Remove extra new line
 2015-07-23 21:32:01 +02:00
Máté Bartus
f34f28f283 Merge pull request #3789 from marc1706/ticket/13982 
[ticket/13982] Remove extra new line
 2015-07-23 21:27:57 +02:00
Mate Bartus
fbd5929606 [ticket/13740] Login admin when install finished 
PHPBB3-13740
 2015-07-23 20:50:33 +02:00
Marc Alexander
4bf0534bf9 [ticket/13982] Remove extra new line 
PHPBB3-13982
 2015-07-23 18:05:12 +02:00
Mate Bartus
dd31020fb3 [ticket/13740] Enhance server output buffer bypass 
PHPBB3-13740
 2015-07-23 16:43:20 +02:00
Marc Alexander
b677bc41c9 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_view.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
 2015-07-23 12:12:03 +02:00