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

21625 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Marc Alexander
92e25398c7 Merge remote-tracking branch 'nickvergessen/ticket/12518' into develop-ascraeus 
* nickvergessen/ticket/12518:
  [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:36:45 +02:00
Joas Schilling
b430979f60 [ticket/12518] Add event to overwrite the cannot edit condition in posting.php 
PHPBB3-12518
 2014-05-11 21:27:21 +02:00
Joas Schilling
aeb5189be0 [ticket/12518] Add event to overwrite the allow edit and delete conditions 
PHPBB3-12518
 2014-05-11 21:27:21 +02:00
Matt Friedman
beab2c9252 [ticket/12531] Restore default topic link functionality in subsilver2 
PHPBB3-12531
 2014-05-11 10:27:47 -07:00
Joas Schilling
e17a156365 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12451] Fix whitespace in posting.php lang file
 2014-05-11 18:57:44 +02:00
Joas Schilling
34e93b0e15 Merge pull request #2442 from Elsensee/ticket/12451-2 
[ticket/12451] Fix whitespace in posting.php lang file

* Elsensee/ticket/12451-2:
  [ticket/12451] Fix whitespace in posting.php lang file
 2014-05-11 18:57:34 +02:00
Oliver Schramm
cce6f7d4a6 [ticket/12451] Fix whitespace in posting.php lang file 
PHPBB3-12451
 2014-05-11 18:20:56 +02:00
Joas Schilling
b9dda0eb15 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12517] Correctly call $log->add in prune shadow topics
 2014-05-11 18:13:42 +02:00
Joas Schilling
8cdc6632ee Merge pull request #2438 from marc1706/ticket/12517 
[ticket/12517] Correctly call $log->add in prune shadow topics

* marc1706/ticket/12517:
  [ticket/12517] Correctly call $log->add in prune shadow topics
 2014-05-11 18:11:44 +02:00
Joas Schilling
90c2bf26c0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
 2014-05-11 18:09:56 +02:00
Joas Schilling
e28b1a8389 Merge pull request #2439 from prototech/ticket/12526 
[ticket/12526] Fix undefined index: filesize when editing PM with attachments.

* prototech/ticket/12526:
  [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
 2014-05-11 18:09:12 +02:00
Joas Schilling
8d17cf5a70 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12529] Move $phpbb_root_path to the end of the constructor
  [ticket/12529] Use root_path in controller\resolver to check the template dir
 2014-05-11 15:47:23 +02:00
Joas Schilling
f37ff48e2c Merge pull request #2441 from Nicofuma/ticket/12529 
[ticket/12529] Use root_path in controller\resolver to check the template dir

* Nicofuma/ticket/12529:
  [ticket/12529] Move $phpbb_root_path to the end of the constructor
  [ticket/12529] Use root_path in controller\resolver to check the template dir
 2014-05-11 15:47:13 +02:00
Tristan Darricau
16cd1db59a [ticket/12529] Move $phpbb_root_path to the end of the constructor 
PHPBB3-12529
 2014-05-11 15:10:14 +02:00
Tristan Darricau
197c801746 [ticket/12529] Use root_path in controller\resolver to check the template dir 
PHPBB3-12529
 2014-05-11 14:10:19 +02:00
Joas Schilling
192bb74e3c [ticket/12527] Use a proper language string on confirm screen 
PHPBB3-12527
 2014-05-11 13:30:13 +02:00
Joas Schilling
eaa4552412 [ticket/12527] Remove unnecessary language strings 
PHPBB3-12527
 2014-05-11 13:30:07 +02:00
Joas Schilling
ada9fc81a3 [ticket/12527] Check whether the language exists 
PHPBB3-12527
 2014-05-11 13:29:56 +02:00
Joas Schilling
63e195d7f0 [ticket/12527] Restore missing files and variables check 
PHPBB3-12527
 2014-05-11 13:29:49 +02:00
Joas Schilling
c334d8431d [ticket/12527] Remove editor from template 
PHPBB3-12527
 2014-05-11 13:29:44 +02:00
Joas Schilling
61bca8ed8a [ticket/12527] Remove language file editor form ACP 
PHPBB3-12527
 2014-05-11 13:29:17 +02:00
Cesar G
a7d1fd44ee [ticket/12526] Fix undefined index: filesize when editing PM with attachments. 
PHPBB3-12526
 2014-05-11 02:36:48 -07:00
Joas Schilling
7ec0289b83 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12501] Only select attachments uploaded before the post was reported.
  [ticket/12501] Parse the reported post message before its attachments.
 2014-05-11 11:01:31 +02:00