Marc Alexander
6618f0ea24
[ticket/11859] Make avatar drivers return template filename
...
The service name might not follow the expected naming scheme which would
cause abnormally long filenames and confusion for authors that might add
more avatar drivers.
PHPBB3-11859
2013-11-27 15:18:42 +01:00
Joas Schilling
125e76f9aa
Merge remote-tracking branch 'prototech/ticket/12036' into develop
...
* prototech/ticket/12036:
[ticket/12036] Re-add missing move up button to module management page.
2013-11-26 14:52:32 +01:00
Joas Schilling
c49e7387d6
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/12037] Fix hard-coded text in acp_inactive.html.
Conflicts:
phpBB/adm/style/acp_inactive.html
2013-11-26 11:33:17 +01:00
Joas Schilling
afb4585dd9
Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus
...
* prototech/ticket/12037:
[ticket/12037] Fix hard-coded text in acp_inactive.html.
2013-11-26 11:31:43 +01:00
Cesar G
e111d7bd13
[ticket/12037] Fix hard-coded text in acp_inactive.html.
...
PHPBB3-12037
2013-11-25 12:38:53 -08:00
Cesar G
95e380ec18
[ticket/12036] Re-add missing move up button to module management page.
...
PHPBB3-12036
2013-11-25 11:56:09 -08:00
Nils Adermann
0d0b2627f7
Merge pull request #1886 from nickvergessen/ticket/12027
...
[Ticket/12027] List redis as service in .travis.yml
2013-11-22 03:24:49 -08:00
Joas Schilling
a3df2cb454
[ticket/12027] List redis as service in .travis.yml
...
PHPBB3-12027
2013-11-22 10:26:05 +01:00
Nathan Guse
6e842f11fc
Merge pull request #1884 from nickvergessen/ticket/12015-2
...
[ticket/12015] Fix variable name and event version
2013-11-21 14:56:05 -08:00
Joas Schilling
2a154d0a10
[ticket/12015] Fix variable name and event version
...
PHPBB3-12015
2013-11-21 23:42:40 +01:00
Nathan Guse
5220013f9d
Merge pull request #1883 from s9e/ticket/12028
...
[ticket/12028] Replace L_COLON with literal colon
2013-11-21 14:24:56 -08:00
Nathan Guse
b64d94b6bc
Merge pull request #1870 from nickvergessen/ticket/12015
...
Ticket/12015 Enhance events in viewtopic to increase their usability
2013-11-21 14:21:31 -08:00
s9e
263f213ffe
[ticket/12028] Replace L_COLON with literal colon
...
Replace L_COLON with literal colon in JavaScript context.
[ci skip]
PHPBB3-12028
2013-11-21 23:20:16 +01:00
Joas Schilling
e9e667762b
[ticket/12015] Fix english grammar
...
PHPBB3-12015
2013-11-21 23:18:29 +01:00
Nathan Guse
df7fa8e499
Merge pull request #1854 from Pico88/ticket/12005
...
[ticket/12005] Remove code responsible for PM popup completely
2013-11-21 14:01:23 -08:00
Nathan Guse
be33d37c89
Merge pull request #1856 from prototech/ticket/12001
...
[ticket/12001] Ensure that form data is sent to server in AJAX requests.
2013-11-21 13:56:03 -08:00
Nathan Guse
38994965f2
Merge pull request #1860 from prototech/ticket/12010
...
[ticket/12010] Make the navbar icons clickable.
2013-11-21 13:53:02 -08:00
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
