mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
21,377 Commits 17 Branches 190 Tags
Commit Graph

21377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joas Schilling
b040c3f7c1 [ticket/12527] Fix "board’s language" vs "boards language" 
PHPBB3-12527
 2014-05-18 12:28:28 +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
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
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
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
Joas Schilling
0ad2e22ec0 [ticket/12555] Add canonical URL for viewtopic 
Avoids duplicate content of:
* viewtopic.php?t=topic_id
* viewtopic.php?f=forum_id&t=topic_id
* viewtopic.php?f=forum_id&t=topic_id&hilit=highlight_string
* viewtopic.php?f=forum_id&t=topic_id&view=unread
* viewtopic.php?f=forum_id&p=post_id
* viewtopic.php?f=forum_id&t=topic_id&start=0

PHPBB3-12555
 2014-05-16 11:38:37 +02:00
Joas Schilling
08b5d052c6 [ticket/12555] Add canonical URL for viewforum 
Avoids duplicate content of:
* viewforum.php?f=forum_id
* viewforum.php?f=forum_id&start=0

PHPBB3-12555
 2014-05-16 11:34:04 +02:00
Joas Schilling
199854af1b [ticket/12555] Add canonical URl for memberlist mode=viewprofile 
Avoids duplicate content of:
* memberlist.php?mode=viewprofile&u=user_id
* memberlist.php?mode=viewprofile&un=username

PHPBB3-12555
 2014-05-16 11:32:33 +02:00
Joas Schilling
613f4f7525 [ticket/12555] Allow to set canonical URLs to avoid duplicate content 
PHPBB3-12555
 2014-05-16 11:32:01 +02:00
Cesar G
9860780ccf [ticket/12550] Prevent last post column from jumping to second line in RTL. 
PHPBB3-12550
 2014-05-15 11:38:04 -07:00
Cesar G
e2f2cc8902 [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages. 
PHPBB3-12549
 2014-05-15 11:36:48 -07:00
Cesar G
4eb1294a27 [ticket/12551] Float breadcrumbs to the right in RTL languages. 
PHPBB3-12551
 2014-05-15 11:30:01 -07: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
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
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
Tristan Darricau
a1e21f0a5c [ticket/12536] Add test cases with empty versions list 
PHPBB3-12536
 2014-05-15 02:10:51 +02:00
Tristan Darricau
e1d9f1c67c [ticket/12536] Use stable values when unstable are unavailable 
PHPBB3-12536
 2014-05-15 01:14:44 +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
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
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
Cesar G
bc31a0d252 [ticket/12543] Only take over ENTER and ESC keys when alert box is active. 
PHPBB3-12543
 2014-05-13 17:49:54 -07: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
9d7c36041e [ticket/12509] Update calls to set_custom_style in forgotten places 
PHPBB3-12509
 2014-05-14 02:16:32 +02: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
Tristan Darricau
c8080d6464 [ticket/12509] Fix path in adm/index.php 
PHPBB3-12509
 2014-05-14 01:11:43 +02:00
Tristan Darricau
57d08dc77b [ticket/12509] Fix typo in adm/index.php 
PHPBB3-12509
 2014-05-14 00:27:04 +02:00
Tristan Darricau
9fc2063d86 [ticket/12509] Fix doc block 
PHPBB3-12509
 2014-05-13 23:49:21 +02:00
Tristan Darricau
1e427fa031 [ticket/12509] Fix the call to set_custom_file in adm/index and messenger 
PHPBB3-12509
 2014-05-13 23:39:42 +02:00
Tristan Darricau
910b9b59b3 [ticket/12509] Update acp custom_style setter 
PHPBB3-12509
 2014-05-13 23:25:44 +02:00
Tristan Darricau
300d5c32db [ticket/12509] Add an option to set the path of custom file for extensions 
https://tracker.phpbb.com/browse/PHPBB3-12509

PHPBB3-12509
 2014-05-13 23:22:54 +02:00
Joas Schilling
dceea23b1f [ticket/12540] Fix broken placeholders in language files 
PHPBB3-12540
 2014-05-13 21:41:11 +02:00
Tristan Darricau
8b6df0e2f8 [ticket/12536] Update doc block 
PHPBB3-12536
 2014-05-13 12:59:10 +02:00
Tristan Darricau
3dddf1f4bf [ticket/12536] Return empty array if stability unavailable 
PHPBB3-12536
 2014-05-13 12:48:08 +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
Tristan Darricau
36d5fff1c6 [ticket/12536] Get Versions Should Not Require Both Stable and Unstable 
https://tracker.phpbb.com/browse/PHPBB3-12536

PHPBB3-12536
 2014-05-12 23:57:08 +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
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