Commit graph

27209 commits

Author SHA1 Message Date
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
rxu
9e467a4e4a [ticket/14072] Add core event to the function format_display()
PHPBB3-14072
2015-08-06 03:51:48 +07: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
2510369804 [ticket/12143] Fix tests after rebase
PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
c3e5185135 [ticket/12143] Avoid no output from get_group_name()
PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
981bd8bed4 [ticket/12143] Fix those tests
I always have to fix them.. :(

PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
ca17bc7187 [ticket/12143] Add some tests
PHPBB3-12143
2015-08-05 17:50:25 +02:00
Oliver Schramm
d4095bb11d [ticket/12143] Oops, fixed array index
PHPBB3-12143
2015-08-05 17:50:25 +02:00
Oliver Schramm
185fbe41c9 [ticket/12143] Replace group name output
So now we can use translated group names for non-special groups

PHPBB3-12143
2015-08-05 17:50:24 +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
Marc Alexander
f4c1796d5e [ticket/14070] Properly pass whether config should be ignored for avatars
PHPBB3-14070
2015-08-05 17:46:17 +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
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
rxu
49bc477a87 [ticket/14067] Add template events to overall_header.html around feeds
PHPBB3-14067
2015-08-05 16:29:06 +07:00
rxu
6a7978965d [ticket/14065] Add template events to attachment.html
Additionally remove some unnecessary empty lines.

PHPBB3-14065
2015-08-03 18:35:15 +07:00
rxu
478a4c4133 [ticket/14064] Add template events to ucp_pm_history.html
PHPBB3-14064
2015-08-03 03:48:20 +07:00
Jakub Senko
7cb7ca57c2 [ticket/14043] Add more parameters to the event
PHPBB3-14043
2015-08-02 20:27:05 +02:00
Oyabun1
84f8d6d64e [ticket/14058] Contact us form missing email subject field in subsilver2
PHPBB3-14058
2015-07-31 22:30:30 +10:00
rxu
0d6c323611 [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.
PHPBB3-13846
2015-07-30 19:35:01 +07: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
RMcGirr83
30449b69af [ticket/13863] Spaces not tabs
PHPBB3-13863
2015-07-29 12:47:31 -04:00
Richard McGirr
9c67d02bd2 [ticket/13863] Add topic_row_append/prepend to mcp_forum.html
PHPBB3-13863
2015-07-28 05:53:30 -04: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