Nathan Guse
355ceac4a0
Merge pull request #1834 from cyberalien/ticket/11984
...
Move responsive design adjustments
2013-11-21 13:42:48 -08:00
Nathan Guse
6f419b0049
Merge pull request #1869 from prototech/ticket/10810
...
[ticket/10810] Move color swatches from popup windows to inline blocks.
2013-11-21 13:41:03 -08:00
Nathan Guse
20885ccb8c
Merge pull request #1882 from prototech/ticket/11959
...
[ticket/11959] Trim the list of users from post notifications.
2013-11-21 13:27:52 -08:00
Nathan Guse
6403d6848e
Merge pull request #1878 from blitze/ticket/12024
...
[ticket/12024] Template event overall_header_content_before
2013-11-21 13:26:24 -08:00
Cesar G
e3a28e5e2a
[ticket/11959] Rename $extra_cnt to something more descriptive.
...
PHPBB3-11959
2013-11-21 13:18:28 -08:00
Cesar G
43f454a6c6
[ticket/11959] Use COMMA_SEPARATOR to join the user list.
...
PHPBB3-11959
2013-11-21 13:15:08 -08:00
Nathan Guse
7c1c870852
Merge pull request #1881 from prototech/ticket/11484
...
[ticket/11484] Display login box for users following email notification link.
2013-11-21 13:04:46 -08:00
Cesar G
bcf347420e
[ticket/11959] Trim the list of users from post notifications.
...
PHPBB3-11959
2013-11-21 13:02:26 -08:00
Cesar G
44b6f45759
[ticket/11484] Display login box for users following email notification link.
...
The link used for the latest post now uses view=unread so redirecting the user
using the value for the e parameter is no longer necessary.
PHPBB3-11484
2013-11-21 08:11:17 -08:00
Vjacheslav Trushkin
739f1a3bdd
[ticket/11984] Do not resize textarea on touch devices
...
PHPBB3-11984
2013-11-19 23:58:05 +02:00
Vjacheslav Trushkin
796e22d675
[ticket/11984] Hide <dfn> for invalid extensions
...
PHPBB3-11984
2013-11-19 23:58:04 +02:00
Vjacheslav Trushkin
366a224a24
[ticket/11984] Fix stray </ul> and active tab hover in ACP
...
PHPBB3-11984
2013-11-19 23:58:04 +02:00
Vjacheslav Trushkin
094da3ba16
[ticket/11984] Prevent AJAX background animation flicker in prosilver
...
PHPBB3-11984
2013-11-19 23:58:04 +02:00
Vjacheslav Trushkin
a5c4e4f3ce
[ticket/11984] Prevent AJAX background animation flicker in ACP
...
PHPBB3-11984
2013-11-19 23:58:04 +02:00
OpenShift guest
55670d75b0
[ticket/12024] Add new line
...
PHPBB3-12024
2013-11-19 09:55:58 -05:00
OpenShift guest
77dc1ac09a
[ticket/12024] Correct the 'since' information in event list
...
PHPBB3-12024
2013-11-19 09:51:47 -05:00
Joas Schilling
46994e8dfb
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11814] Remove redundant text from the topic reply email notification.
2013-11-19 15:28:37 +01:00
Joas Schilling
af3417ce86
Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympus
...
* prototech/ticket/11814:
[ticket/11814] Remove redundant text from the topic reply email notification.
2013-11-19 15:28:06 +01:00
Cesar G
f833a42e7e
[ticket/11814] Remove redundant text from the topic reply email notification.
...
PHPBB3-11814
2013-11-19 06:20:37 -08:00
OpenShift guest
122e95486c
[ticket/12024] Update events list
...
PHPBB3-12024
2013-11-18 23:44:59 -05:00
OpenShift guest
bc47455dfb
[ticket/12024] Replace newline
...
PHPBB3-12024
2013-11-18 23:43:39 -05:00
OpenShift guest
9d39457e35
[ticket/12024] Template event overall_header_content_before
...
http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959
http://tracker.phpbb.com/browse/PHPBB3-12024
PHPBB3-12024
2013-11-18 23:17:03 -05:00
Joas Schilling
8ae315a796
Merge branch 'prep-release-3.1.0-a2' into develop
...
* prep-release-3.1.0-a2:
[prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant
[prep-release-3.1.0-a2] Add changelog for alpha2
[prep-release-3.1.0-a2] Prepare Changelog
[prep-release-3.1.0-a2] Add migration for 3.1.0-a2
[prep-release-3.1.0-a2] Update version to 3.1.0-a2
2013-11-19 01:39:25 +01:00
Joas Schilling
d67341ea00
[prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant
2013-11-19 01:37:31 +01:00
Joas Schilling
e74b5ac9e3
[prep-release-3.1.0-a2] Add changelog for alpha2
2013-11-19 01:19:20 +01:00
Joas Schilling
212e367bfe
[prep-release-3.1.0-a2] Prepare Changelog
2013-11-19 01:18:22 +01:00
Joas Schilling
7678186b09
[prep-release-3.1.0-a2] Add migration for 3.1.0-a2
2013-11-19 01:18:21 +01:00
Joas Schilling
6ee05d369e
[prep-release-3.1.0-a2] Update version to 3.1.0-a2
2013-11-19 01:18:21 +01:00
Joas Schilling
d213e23ab6
Merge remote-tracking branch 'Marc/ticket/11896' into develop
...
* Marc/ticket/11896:
[ticket/11896] Use $form_time and fix out of bounds $form_time
[ticket/11896] Correctly document return of null in docblocks
[ticket/11896] Minor code improvements in phpbb_functional_test_case
[ticket/11896] Add functional tests for marking all notifications read
[ticket/11896] Add ability to define expected message after posting
[ŧicket/11896] Set form_time with time() when marking all notifications read
2013-11-19 01:03:12 +01:00
Nils Adermann
c31787436e
Merge pull request #1877 from nickvergessen/ticket/12023
...
Ticket/12023 New css files missing after update
2013-11-18 15:28:57 -08:00
Joas Schilling
5fe822021b
[ticket/12023] Correctly compare the size of the array in ignore_new_files
...
PHPBB3-12023
2013-11-19 00:23:49 +01:00
Joas Schilling
632d6e9621
[ticket/12023] Add test for failing .css copy
...
PHPBB3-12023
2013-11-19 00:23:23 +01:00
Marc Alexander
0d3396487e
[ticket/11896] Use $form_time and fix out of bounds $form_time
...
PHPBB3-11896
2013-11-14 18:16:29 +01:00
Joas Schilling
ace66f861a
Merge remote-tracking branch 'Marc/ticket/12018' into develop
...
* Marc/ticket/12018:
[ticket/12018] Use path_helper for admin style CSS in sql report
2013-11-14 17:36:12 +01:00
Marc Alexander
23e2f920f5
[ticket/12018] Use path_helper for admin style CSS in sql report
...
The path to the admin style CSS is currently created with $phpbb_admin_path.
We should however use the path_helper to correctly link to this file in order
to have a correct link on pages like extensions
PHPBB3-12018
2013-11-14 15:55:04 +01:00
Marc Alexander
7f10312bf2
[ticket/11896] Correctly document return of null in docblocks
...
Also got rid of previous incorrect comment in docblocks.
PHPBB3-11896
2013-11-14 15:17:25 +01:00
Marc Alexander
308329b547
[ticket/11896] Minor code improvements in phpbb_functional_test_case
...
Use assertContainsLang() and get rid of unnecessary logic in create_post()
and create_topic(). The docblocks were also slightly improved.
PHPBB3-11896
2013-11-14 15:09:49 +01:00
Joas Schilling
692fbf732f
Merge remote-tracking branch 'prototech/ticket/12008' into develop
...
* prototech/ticket/12008:
[ticket/12008] Update the run time value for the prune notifications cron task
[ticket/12008] The read_notification_last_gc config setting should be dynamic.
2013-11-14 12:38:06 +01:00
Cesar G
287c2550b8
[ticket/12008] Update the run time value for the prune notifications cron task
...
PHPBB3-12008
2013-11-14 01:05:58 -08:00
Cesar G
50896305fa
[ticket/12008] The read_notification_last_gc config setting should be dynamic.
...
PHPBB3-12008
2013-11-14 01:05:53 -08:00
David King
8fd1f90e5f
Merge pull request #1872 from nickvergessen/ticket/12017
...
Ticket/12017 Extension tests are broken on current develop
2013-11-13 16:34:32 -08:00
Joas Schilling
1e73e0c954
[ticket/12017] Fix phpbb requirement in composer.json
...
PHPBB3-12017
2013-11-14 00:15:23 +01:00
Joas Schilling
4e2bb6ef53
[ticket/12017] Copy config/ dir so events work
...
PHPBB3-12017
2013-11-14 00:14:53 +01:00
Joas Schilling
009a1303f5
[ticket/12017] Remove IN_PHPBB defined check
...
PHPBB3-12017
2013-11-14 00:14:04 +01:00
Nils Adermann
52845b22f2
Merge pull request #1815 from marc1706/ticket/11525
...
[ticket/11525] Only remove group or user prefix from given avatar data
2013-11-13 09:52:21 -08:00
Marc Alexander
13a4ceedb1
[ticket/11525] Use foreach instead of array_walk in method clean_row()
...
This approach is cleaner and probably even faster the previous ways that
included using array_walk() or array_map() and other helper functions
and methods.
PHPBB3-11525
2013-11-13 18:27:40 +01:00
Nils Adermann
e48b2c07eb
Merge pull request #1871 from nickvergessen/ticket/12016
...
Ticket/12016 Event listeners should be services
2013-11-13 08:45:48 -08:00
Joas Schilling
fbf5911ac5
[ticket/12016] Update functional tests to use service for event listeners
...
PHPBB3-12016
2013-11-13 17:38:58 +01:00
Joas Schilling
d3f9a51709
[ticket/12016] Use a service provider for event listeners
...
This allows them to use dependency injection
PHPBB3-12016
2013-11-13 17:34:06 +01:00
Cesar G
97915b467e
[ticket/10810] Remove obsolete swatch code.
...
PHPBB3-10810
2013-11-13 01:27:24 -08:00
