makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
21495 commits 18 branches 192 tags 207 MiB
Commit graph

21495 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
59ca723174 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12572] Fix JS error when alert message title is undefined
 2014-05-23 00:58:12 +02:00
Andreas Fischer
7a464a83b5 Merge pull request #2480 from rxu/ticket/12572 
[ticket/12572] Fix JS error when alert message title is undefined

* rxu/ticket/12572:
  [ticket/12572] Fix JS error when alert message title is undefined
 2014-05-23 00:58:12 +02:00
Joas Schilling
0bc73cf9f8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12551] Float breadcrumbs to the right in RTL languages.
 2014-05-23 00:46:03 +02:00
Joas Schilling
adf5daa1c7 Merge pull request #2467 from prototech/ticket/12551 
[ticket/12551] Float breadcrumbs to the right in RTL languages.

* prototech/ticket/12551:
  [ticket/12551] Float breadcrumbs to the right in RTL languages.
 2014-05-23 00:45:35 +02:00
Joas Schilling
69e3b5eda6 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12550] Prevent last post column from jumping to second line in RTL.
 2014-05-23 00:45:21 +02:00
Joas Schilling
7223339f1e Merge pull request #2466 from prototech/ticket/12550 
[ticket/12550] Prevent last post column from jumping to second line in RTL.

* prototech/ticket/12550:
  [ticket/12550] Prevent last post column from jumping to second line in RTL.
 2014-05-23 00:45:06 +02:00
Joas Schilling
7f62d8ea21 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
 2014-05-23 00:44:46 +02:00
Joas Schilling
a9cce2e857 Merge pull request #2465 from prototech/ticket/12549 
[ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.

* prototech/ticket/12549:
  [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
 2014-05-23 00:44:20 +02:00
Andreas Fischer
c3639a4d5f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12576] Retrieve the cron_manager in cron.php if needed
  [ticket/12576] Remove cron from common.php
 2014-05-23 00:34:28 +02:00
Andreas Fischer
1eef2f2782 Merge pull request #2484 from Nicofuma/ticket/12576 
[ticket/12576] Remove cron from common.php

* Nicofuma/ticket/12576:
  [ticket/12576] Retrieve the cron_manager in cron.php if needed
  [ticket/12576] Remove cron from common.php
 2014-05-23 00:34:28 +02:00
Andreas Fischer
9b52f17fcc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php
  [ticket/12586] Use dot filter when trying to find available extensions
 2014-05-23 00:19:33 +02:00
Andreas Fischer
b0dd144fe3 Merge pull request #2491 from nickvergessen/ticket/12586 
Ticket/12586 Filter files and depth when looking for extensions

* nickvergessen/ticket/12586:
  [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php
  [ticket/12586] Use dot filter when trying to find available extensions
 2014-05-23 00:19:32 +02:00
Joas Schilling
1572aca7b0 [ticket/12586] Limit depth to 2, we require vendor/extension/ext.php 
PHPBB3-12586
 2014-05-22 23:43:35 +02:00
Joas Schilling
488904d0bf [ticket/12586] Use dot filter when trying to find available extensions 
PHPBB3-12586
 2014-05-22 23:42:49 +02:00
rxu
6466002052 [ticket/12572] Fix JS error when alert message title is undefined 
JS console reports error in core.js:
TypeError: alert is undefined
alert.hide()
when res.MESSAGE_TITLE is undefined.

PHPBB3-12572
 2014-05-22 19:59:33 +08:00
Tristan Darricau
004b317876 [ticket/12576] Retrieve the cron_manager in cron.php if needed 
PHPBB3-12576
 2014-05-22 13:47:37 +02:00
Tristan Darricau
ff280d3f46 [ticket/12576] Remove cron from common.php 
PHPBB3-12576
 2014-05-22 12:45:03 +02: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
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
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