Matt Friedman
6aeb22bfd7
[ticket/12564] Remove version definition from ACP/MCP/UCP module info files
...
PHPBB3-12564
2014-05-18 17:43:26 -07:00
Joas Schilling
c72e6ceb06
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[task/sami] Establish alphabetical order.
[task/sami] Also ignore ext/ directory.
[task/sami] Replace phpdoctor with sami.
[task/sami] Add sami/sami as a composer development dependency.
2014-05-18 18:58:40 +02:00
Joas Schilling
a2cd9c2464
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
2014-05-18 18:58:30 +02:00
Joas Schilling
785c56ab56
Merge pull request #2471 from bantu/task/sami-ascraeus
...
[task/sami-ascraeus] Add Sami to composer dependencies and build script
* bantu/task/sami-ascraeus:
[task/sami] Establish alphabetical order.
[task/sami] Also ignore ext/ directory.
[task/sami] Replace phpdoctor with sami.
[task/sami] Add sami/sami as a composer development dependency.
2014-05-18 18:58:27 +02:00
Joas Schilling
ac3e0e53b2
Merge pull request #2470 from bantu/task/sami
...
[task/sami] Add Sami to composer dependencies and build script
* bantu/task/sami:
[task/sami] Establish alphabetical order.
[task/sami] Also ignore ext/ directory.
[task/sami] Replace phpdoctor with sami.
[task/sami] Add sami/sami as a composer development dependency.
2014-05-18 18:56:52 +02:00
Andreas Fischer
e44acf4084
Merge branch 'task/sami' into task/sami-ascraeus
...
* task/sami:
[task/sami] Establish alphabetical order.
[task/sami] Also ignore ext/ directory.
2014-05-17 13:07:00 +02:00
Andreas Fischer
223058c8c6
[task/sami] Establish alphabetical order.
...
PHPBB3-12495
2014-05-17 13:05:52 +02:00
Andreas Fischer
6a97d9f855
[task/sami] Also ignore ext/ directory.
...
PHPBB3-12495
2014-05-17 13:04:25 +02:00
Cesar G
35edb62bb0
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12547] Rename jquery.js to jquery.min.js in assets directory
2014-05-16 22:05:15 -07:00
Cesar G
8b5b318f0a
Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeus
...
* n-aleha/ticket/12547:
[ticket/12547] Rename jquery.js to jquery.min.js in assets directory
2014-05-16 22:04:52 -07:00
Cesar G
e31739212d
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12525] Add string argument to contact and email user language variables
2014-05-16 20:05:04 -07:00
Cesar G
747eb198ef
Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeus
...
* n-aleha/ticket/12525:
[ticket/12525] Add string argument to contact and email user language variables
2014-05-16 20:04:34 -07:00
n-aleha
a114333209
[ticket/12525] Add string argument to contact and email user language variables
...
In language/en/common.php:
* Introduce a new language variable 'CONTACT' => 'Contact'
* Add a string argument to lang var 'CONTACT_USER' to avoid an appended
'{USERNAME}' in template.
* Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended
'{USERNAME}' in template.
Also fix typos.
PHPBB3-12525
2014-05-17 04:50:57 +03:00
Cesar G
022590268b
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12533] Make <a> use all the "see all" "button"
[ticket/12533] Make <a> use all the notification item size
2014-05-16 17:01:03 -07:00
Cesar G
5dc0605b6b
Merge remote-tracking branch 'brunoais/ticket/PHPBB3-12533' into develop-ascraeus
...
* brunoais/ticket/PHPBB3-12533:
[ticket/12533] Make <a> use all the "see all" "button"
[ticket/12533] Make <a> use all the notification item size
2014-05-16 17:00:40 -07:00
Andreas Fischer
9cea96ad4e
Merge branch 'task/sami' into task/sami-ascraeus
...
* task/sami:
[task/sami] Replace phpdoctor with sami.
[task/sami] Add sami/sami as a composer development dependency.
Conflicts:
phpBB/composer.json
phpBB/composer.lock
2014-05-16 18:13:45 +02:00
Andreas Fischer
f08f283143
[task/sami] Replace phpdoctor with sami.
...
PHPBB3-12495
2014-05-16 17:56:03 +02:00
Andreas Fischer
b32f91b9c6
[task/sami] Add sami/sami as a composer development dependency.
...
PHPBB3-12495
2014-05-16 17:55:41 +02:00
Andreas Fischer
bd81003759
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12433] Use a different message when nesting of quotes is not allowed
2014-05-15 16:48:19 +02:00
Andreas Fischer
a496015b98
Merge pull request #2463 from nickvergessen/ticket/12433
...
[ticket/12433] Use a different message when nesting of quotes is not allowed
* nickvergessen/ticket/12433:
[ticket/12433] Use a different message when nesting of quotes is not allowed
2014-05-15 16:48:18 +02:00
Andreas Fischer
c39eef90e7
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/11163] Add ext/index.htm
2014-05-15 16:33:55 +02:00
Andreas Fischer
46ca856bda
Merge pull request #2464 from nickvergessen/ticket/11163
...
[ticket/11163] Add ext/index.htm
* nickvergessen/ticket/11163:
[ticket/11163] Add ext/index.htm
2014-05-15 16:33:55 +02:00
Joas Schilling
0f30613a7e
[ticket/11163] Add ext/index.htm
...
PHPBB3-11163
2014-05-15 14:11:11 +02:00
Joas Schilling
34c1691d7e
[ticket/12433] Use a different message when nesting of quotes is not allowed
...
PHPBB3-12433
2014-05-15 14:03:27 +02:00
Andreas Fischer
572cd972a7
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12540] Fix broken placeholders in language files
2014-05-15 13:42:06 +02:00
Andreas Fischer
8b8c25194a
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12540] Fix broken placeholders in language files
Conflicts:
phpBB/language/en/common.php
phpBB/language/en/posting.php
phpBB/language/en/ucp.php
2014-05-15 13:41:54 +02:00
Andreas Fischer
f2500da8ec
Merge pull request #2454 from nickvergessen/ticket/12540
...
[ticket/12540] Fix broken placeholders in language files
* nickvergessen/ticket/12540:
[ticket/12540] Fix broken placeholders in language files
2014-05-15 13:36:06 +02:00
n-aleha
cc99a6b6ab
[ticket/12547] Rename jquery.js to jquery.min.js in assets directory
...
phpBB uses the minified version of jQuery hence the rename.
PHPBB3-12547
2014-05-15 01:18:26 +03:00
Andreas Fischer
d867e52a2e
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12435] Update the comment
[ticket/12435] purge_notifications() fails for unused notifications
2014-05-14 23:12:11 +02:00
Andreas Fischer
dacece711b
Merge pull request #2456 from Nicofuma/ticket/12435
...
[ticket/12435] purge_notifications() fails for unused notifications
* Nicofuma/ticket/12435:
[ticket/12435] Update the comment
[ticket/12435] purge_notifications() fails for unused notifications
2014-05-14 23:12:11 +02:00
Andreas Fischer
84f8f18b1c
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12544] Update Plupload to 2.1.2.
2014-05-14 23:04:26 +02:00
Andreas Fischer
1b8bcef2d1
Merge pull request #2457 from prototech/ticket/12544
...
[ticket/12544] Update Plupload to 2.1.2.
* prototech/ticket/12544:
[ticket/12544] Update Plupload to 2.1.2.
2014-05-14 23:04:25 +02:00
brunoais
d27ece1994
[ticket/12533] Make <a> use all the "see all" "button"
...
Changed the CSS so that the `<a>` of the notifications
list for the "see all" uses all the container.
PHPBB3-12533
2014-05-14 09:51:51 +01:00
brunoais
86d19b6062
[ticket/12533] Make <a> use all the notification item size
...
Changed padding CSS to the notifications' `<li>` and it's
`<a>` (immediate child) so that the `<a>` block uses all
it's container width and height.
To compensate that, I added the padding that was in the
`<li>` to the `<a>`
PHPBB3-12533
2014-05-14 09:51:39 +01:00
Tristan Darricau
7af785f903
[ticket/12435] Update the comment
...
PHPBB3-12435
2014-05-14 02:32:12 +02:00
Cesar G
c1b817466c
[ticket/12544] Update Plupload to 2.1.2.
...
PHPBB3-12544
2014-05-13 17:23:48 -07:00
Tristan Darricau
cb97c26e88
[ticket/12435] purge_notifications() fails for unused notifications
...
https://tracker.phpbb.com/browse/PHPBB3-12435
PHPBB3-12435
2014-05-14 02:09:41 +02:00
Joas Schilling
dceea23b1f
[ticket/12540] Fix broken placeholders in language files
...
PHPBB3-12540
2014-05-13 21:41:11 +02:00
Joas Schilling
bf1f0b8062
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12519] Restore m_approve language description
2014-05-13 12:21:41 +02:00
Joas Schilling
bec9b7c34e
Merge pull request #2452 from n-aleha/ticket/12519
...
[ticket/12519] Restore m_approve language description
* n-aleha/ticket/12519:
[ticket/12519] Restore m_approve language description
2014-05-13 12:21:28 +02:00
n-aleha
9c8e228236
[ticket/12519] Restore m_approve language description
...
Restore acl_m_approve language description to:
"Can approve and restore posts"
PHPBB3-12519
2014-05-12 22:15:39 +03:00
Marc Alexander
ddced2ac4d
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12534] Fix filter for functional tests
[ticket/12534] Do not use errorbox for multi steps
[ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
2014-05-12 13:10:23 +02:00
Marc Alexander
b62c39c36e
Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeus
...
* nickvergessen/ticket/12534:
[ticket/12534] Fix filter for functional tests
[ticket/12534] Do not use errorbox for multi steps
[ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
2014-05-12 13:09:44 +02:00
Joas Schilling
b3eb38ecaf
[ticket/12534] Fix filter for functional tests
...
PHPBB3-12534
2014-05-12 11:38:14 +02:00
Joas Schilling
0c6ef9aabf
[ticket/12534] Do not use errorbox for multi steps
...
PHPBB3-12534
2014-05-12 11:35:59 +02:00
Joas Schilling
1d4c20b3d2
[ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
...
PHPBB3-12534
2014-05-12 10:49:52 +02:00
Andreas Fischer
4f8b33cc14
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12518] Apply De Morgan to make the conditions easier to read
2014-05-12 01:10:30 +02:00
Andreas Fischer
bfacf2d6eb
Merge pull request #2446 from nickvergessen/ticket/12518
...
[ticket/12518] Apply De Morgan to make the conditions easier reasable
* nickvergessen/ticket/12518:
[ticket/12518] Apply De Morgan to make the conditions easier to read
2014-05-12 01:10:30 +02:00
Joas Schilling
8d20f095aa
[ticket/12518] Apply De Morgan to make the conditions easier to read
...
PHPBB3-12518
2014-05-11 22:52:09 +02:00
Marc Alexander
bf7a1e3e55
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12518] Add event to overwrite the cannot edit condition in posting.php
[ticket/12518] Add event to overwrite the allow edit and delete conditions
2014-05-11 22:38:04 +02:00
