mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-27 13:40:28 +01:00
Code Issues Releases Wiki Activity
31,268 Commits 10 Branches 193 Tags
ef0680fd196e7bf11384cf32c3941c7004590b5d
Commit Graph

3985 Commits

Author SHA1 Message Date
Tristan Darricau
f56fe0ba8d Merge pull request #3842 from CHItA/ticket/14097 
[ticket/14097] Improve error and failure handling in the installer

* CHItA/ticket/14097:
  [ticket/14097] Remove auto refresh on install failure
  [ticket/14097] Improve error and failure handling in the installer
 2015-08-23 21:44:28 +02:00
Joas Schilling
05851e2b4b Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-08-23 18:27:30 +02:00
Joas Schilling
623a8f2d0f [prep-release-3.1.6] Add migration for 3.1.6-RC1 2015-08-23 16:54:43 +02:00
Joas Schilling
a7272fec97 Merge pull request #3829 from Nicofuma/ticket/14099 
[ticket/14099] Update Twig to 1.20.0
 2015-08-23 16:30:26 +02:00
Marc Alexander
f2edec90b0 Merge branch '3.1.x' 2015-08-22 10:37:53 +02:00
Marc Alexander
d8dd6bad6b Merge pull request #3834 from brunoais/ticket/14104 
[ticket/14104] Fix missing  variables from previous commit
 2015-08-22 10:37:48 +02:00
Mate Bartus
dd1b777ca7 [ticket/14097] Remove auto refresh on install failure 
PHPBB3-14097
 2015-08-21 18:03:36 +02:00
Marc Alexander
942705e6c6 Merge branch '3.1.x' 2015-08-20 15:48:18 +02:00
Marc Alexander
897b9f333b [ticket/14037] Minor coding style improvements to event 
PHPBB3-14037
 2015-08-20 10:14:07 +02:00
javiexin
cf0170d5e3 [ticket/14037] Allows adapting memberlist profile fields headline 
Adds an event to allow modifying the profile fields headline in line
with modifications to profile fields data.

PHPBB3-14037
 2015-08-20 10:12:59 +02:00
Andreas Fischer
0a5f7d2e51 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Andreas Fischer
ef3de412b7 Merge pull request #3848 from VSEphpbb/ticket/14116 
[ticket/14116] sql_affectedrows method has no arguments

* VSEphpbb/ticket/14116:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Matt Friedman
50a7167c9a [ticket/14116] sql_affectedrows method has no arguments 
PHPBB3-14116
 2015-08-19 16:12:01 -07:00
Tristan Darricau
5f905f67ee [ticket/14099] Fix the assets 
PHPBB3-14099
 2015-08-18 21:03:03 +02:00
Mate Bartus
f4f0ff0eec [ticket/14097] Improve error and failure handling in the installer 
PHPBB3-14097
 2015-08-17 18:38:07 +02:00
brunoais
81b4293cc5 [ticket/14104] Fix missing variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13691

PHPBB3-14104
 2015-08-15 22:04:51 +01:00
Tristan Darricau
a83bcaa8ac [ticket/14099] Fix tests 
PHPBB3-14099
 2015-08-14 15:52:35 +02:00
Marc Alexander
dc55863cad Merge branch '3.1.x' 2015-08-13 07:52:36 +02:00
Zoddo
9d4228291c [ticket/13968] Add core.user_setup_after event 
It allows to execute code at the end of user setup.
It can replace the phpbb_user_session_handler hook.

PHPBB3-13968
 2015-08-12 22:26:06 +02:00
Andreas Fischer
92b23df864 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
 2015-08-10 13:20:04 +02:00
Andreas Fischer
3bd5fe6be8 Merge pull request #3811 from marcovo/ticket/14069 
[ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration

* marcovo/ticket/14069:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
 2015-08-10 13:20:03 +02:00
Marc Alexander
b1d8f8a22c Merge branch '3.1.x' 2015-08-09 10:00:34 +02:00
Marc Alexander
8d54f06d19 Merge pull request #3822 from brunoais/ticket/14083 
[ticket/14083] Fix wrong variables from previous commit
 2015-08-09 10:00:29 +02:00
Marc Alexander
994b9c2c77 Merge branch '3.1.x' 2015-08-09 09:56:40 +02:00
brunoais
7a2f72df75 [ticket/14083] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13693

PHPBB3-14083
 2015-08-08 22:45:38 +01:00
brunoais
84a40b6ad1 [ticket/14082] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13686

PHPBB3-14082
 2015-08-08 22:23:17 +01:00
Marc Alexander
47b32f1da9 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php
 2015-08-08 22:23:03 +02:00
Marc Alexander
b7e4d0b0a5 Merge pull request #3738 from javiexin/ticket/13981 
[ticket/13981] Add events to capture avatar deletion or overwriting
 2015-08-08 22:21:11 +02:00
Tristan Darricau
05d583bba7 [ticket/14079] Correctly mark notifications as read 
PHPBB3-14079
 2015-08-08 19:18:18 +02:00
Tristan Darricau
7e62b3a4b0 [ticket/14076] Fix notification settings 
PHPBB3-14076
 2015-08-07 16:38:53 +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
Marco Kubuntu
32f5dc3d8b [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration 
Changed the sql_fetchfield() call to comply to the function definition.

PHPBB3-14069
 2015-08-05 19:07:02 +02:00
Oliver Schramm
4b3343e756 [ticket/12143] Add group helper class to translate groupnames 
We can translate groupnames now even though these groups aren't special

PHPBB3-12143
 2015-08-05 17:50:22 +02:00
Oliver Schramm
2b30e632b6 [ticket/12143] Add is_set method to language service 
We need that.

PHPBB3-12143
 2015-08-05 17:45:14 +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
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
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
RMcGirr83
771090f13e [ticket/13711] Notifications are sent to inactive users 
PHPBB3-13711
 2015-07-27 06:27:25 -04: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
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
javiexin
c3d77edd83 [ticket/13981] Add events to capture avatar deletion or overwriting 
An event to capture new avatar moving in place (and maybe overwriting
existing avatar), and another to capture deletion.  Includes better error
processing.  Rename event.

PHPBB3-13981
 2015-07-24 10:52:00 +02:00