mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
19,465 Commits 17 Branches 190 Tags
Commit Graph

19465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 release-3.1.0-a2 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
68db335468 [ticket/11997] Remove obsolete failover_flag in function redirect() 
This flag is no longer needed as the failover is no longer needed.

PHPBB3-11997
 2013-11-17 20:16:02 +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
Joas Schilling
ace66f861a Merge remote-tracking branch 'Marc/ticket/12018' into develop 
* Marc/ticket/12018:
  [ticket/12018] Use path_helper for admin style CSS in sql report
 2013-11-14 17:36:12 +01:00
Marc Alexander
23e2f920f5 [ticket/12018] Use path_helper for admin style CSS in sql report 
The path to the admin style CSS is currently created with $phpbb_admin_path.
We should however use the path_helper to correctly link to this file in order
to have a correct link on pages like extensions

PHPBB3-12018
 2013-11-14 15:55:04 +01:00
Marc Alexander
7f10312bf2 [ticket/11896] Correctly document return of null in docblocks 
Also got rid of previous incorrect comment in docblocks.

PHPBB3-11896
 2013-11-14 15:17:25 +01:00
Marc Alexander
df6e03266f [ticket/11912] Remove obsolete "return null" in content_guesser 
PHPBB3-11912
 2013-11-14 15:12:42 +01:00
Marc Alexander
308329b547 [ticket/11896] Minor code improvements in phpbb_functional_test_case 
Use assertContainsLang() and get rid of unnecessary logic in create_post()
and create_topic(). The docblocks were also slightly improved.

PHPBB3-11896
 2013-11-14 15:09:49 +01:00
Joas Schilling
692fbf732f Merge remote-tracking branch 'prototech/ticket/12008' into develop 
* prototech/ticket/12008:
  [ticket/12008] Update the run time value for the prune notifications cron task
  [ticket/12008] The read_notification_last_gc config setting should be dynamic.
 2013-11-14 12:38:06 +01:00
Cesar G
287c2550b8 [ticket/12008] Update the run time value for the prune notifications cron task 
PHPBB3-12008
 2013-11-14 01:05:58 -08:00
Cesar G
50896305fa [ticket/12008] The read_notification_last_gc config setting should be dynamic. 
PHPBB3-12008
 2013-11-14 01:05:53 -08:00
David King
8fd1f90e5f Merge pull request #1872 from nickvergessen/ticket/12017 
Ticket/12017 Extension tests are broken on current develop
 2013-11-13 16:34:32 -08:00
Joas Schilling
1e73e0c954 [ticket/12017] Fix phpbb requirement in composer.json 
PHPBB3-12017
 2013-11-14 00:15:23 +01:00
Joas Schilling
4e2bb6ef53 [ticket/12017] Copy config/ dir so events work 
PHPBB3-12017
 2013-11-14 00:14:53 +01:00
Joas Schilling
009a1303f5 [ticket/12017] Remove IN_PHPBB defined check 
PHPBB3-12017
 2013-11-14 00:14:04 +01:00
Vjacheslav Trushkin
6b39f3b6a7 [ticket/11979] Add ability to create dropdown menu to prosilver 
PHPBB3-11979
 2013-11-14 00:45:22 +02:00
Joas Schilling
39be6ab521 [ticket/12015] Add some parameters to viewonline events 
PHPBB3-12015
 2013-11-13 23:44:57 +01:00
Nils Adermann
52845b22f2 Merge pull request #1815 from marc1706/ticket/11525 
[ticket/11525] Only remove group or user prefix from given avatar data
 2013-11-13 09:52:21 -08:00
Marc Alexander
13a4ceedb1 [ticket/11525] Use foreach instead of array_walk in method clean_row() 
This approach is cleaner and probably even faster the previous ways that
included using array_walk() or array_map() and other helper functions
and methods.

PHPBB3-11525
 2013-11-13 18:27:40 +01:00
Nils Adermann
e48b2c07eb Merge pull request #1871 from nickvergessen/ticket/12016 
Ticket/12016 Event listeners should be services
 2013-11-13 08:45:48 -08:00
Joas Schilling
fbf5911ac5 [ticket/12016] Update functional tests to use service for event listeners 
PHPBB3-12016
 2013-11-13 17:38:58 +01:00
Joas Schilling
d3f9a51709 [ticket/12016] Use a service provider for event listeners 
This allows them to use dependency injection

PHPBB3-12016
 2013-11-13 17:34:06 +01:00
Joas Schilling
ecda590b86 [ticket/12015] Add @change to events that got changed 
PHPBB3-12015
 2013-11-13 17:13:18 +01:00
Marc Alexander
27ae58713b Merge pull request #4 from nickvergessen/ticket/marc/11997 
Ticket/marc/11997
 2013-11-13 07:34:40 -08:00
Joas Schilling
a0fca0acc2 [ticket/11997] Add functional test for redirects in controller 
PHPBB3-11997
 2013-11-13 16:30:20 +01:00
Joas Schilling
c2c976fe03 [ticket/12015] Add post counting information to event 
PHPBB3-12015
 2013-11-13 16:24:25 +01:00
Joas Schilling
1efab9ec77 [ticket/12015] Add an event after the post has been assigned to the template 
PHPBB3-12015
 2013-11-13 14:31:51 +01:00
Joas Schilling
e3b70c4c08 [ticket/12015] Add attachments to core.viewtopic_modify_post_row 
PHPBB3-12015
 2013-11-13 14:30:20 +01:00
Joas Schilling
f4cff08a19 [ticket/12015] Add more parameters to core.viewtopic_get_post_data 
PHPBB3-12015
 2013-11-13 14:29:24 +01:00
Joas Schilling
0aed281676 [ticket/11997] Fix missing global 
PHPBB3-11997
 2013-11-13 11:30:41 +01:00
Joas Schilling
0a7db81426 [ticket/11997] Fix redirects from inside controllers 
The redirect url currently uses the web root path. However as we prepend the
full board url later, we need to remove the relative web root path and prepend
the normal root path again. Otherwise redirects from inside routes will not
work as intended.

PHPBB3-11997
 2013-11-13 11:30:13 +01:00
Cesar G
97915b467e [ticket/10810] Remove obsolete swatch code. 
PHPBB3-10810
 2013-11-13 01:27:24 -08:00
Cesar G
c5680ca822 [ticket/10810] Update all palettes. 
PHPBB3-10810
 2013-11-13 01:24:37 -08:00
Cesar G
9a9669bebd [ticket/10810] Make the color palette usable outside of the editor context. 
PHPBB3-10810
 2013-11-13 01:01:15 -08:00
Cesar G
0385d16364 [ticket/10810] Move the color palette code to core.js. 
PHPBB3-10810
 2013-11-12 23:57:27 -08:00
David King
37f73f86e2 Merge pull request #1800 from prototech/ticket/11472 
[ticket/11472] Make prosilver's editor.js an asset used by all styles.
 2013-11-12 18:16:41 -08:00