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
22962 commits 18 branches 192 tags 207 MiB
Commit graph

22962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
d4eec54686 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12881] Checks earlier if server-side topic marking is enabled
 2014-07-26 22:50:07 +02:00
Andreas Fischer
155f709e36 Merge pull request #2777 from Nicofuma/ticket/12881 
[ticket/12881] Debug error - Undefined index: mark_time

* Nicofuma/ticket/12881:
  [ticket/12881] Checks earlier if server-side topic marking is enabled
 2014-07-26 22:50:06 +02:00
Tristan Darricau
af0c9d7a68 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop
 2014-07-25 18:35:12 +02:00
Tristan Darricau
9d6ff36c6c Merge pull request #2779 from nickvergessen/ticket/12892 
[ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop

* nickvergessen/ticket/12892:
  [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop
 2014-07-25 18:34:21 +02:00
Joas Schilling
831e9116ab [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loop 
We do not set S_NUM_ROWS while adding a row, to reduce the complexity
If we would set it on adding, each subsequent adding would cause
n modifications, resulting in a O(n!) complexity, rather then O(n)

PHPBB3-12892
 2014-07-25 17:48:53 +02:00
Tristan Darricau
d9a62a7333 [ticket/12881] Checks earlier if server-side topic marking is enabled 
PHPBB3-12881
 2014-07-25 00:22:46 +02:00
Dhruv
f93559d013 Merge branch 'develop-ascraeus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12887] Fix Typo: offest -> offset
 2014-07-24 19:03:20 +05:30
Dhruv Goel
8064d2931f Merge pull request #2773 from bantu/ticket/12887 
[ticket/12887] Fix Typo: offest -> offset
 2014-07-24 19:02:07 +05:30
Marc Alexander
8f8605cee7 Merge branch 'develop-ascraeus' into develop 2014-07-24 11:01:14 +02:00
Marc Alexander
3cd7078900 Merge remote-tracking branch 'paybas/ticket/12857' into develop-ascraeus 2014-07-24 11:00:43 +02:00
PayBas
1bd5edacb6 [ticket/12857] Add header/footer distinction for subsilver2 events 
PHPBB3-12857
 2014-07-23 16:09:12 +02:00
PayBas
5507c503b4 [ticket/12857] Clarify events.md on difference between PS and SS2 breadcrumbs 
PHPBB3-12857
 2014-07-23 10:37:44 +02:00
Andreas Fischer
b5c847c2ef [ticket/12887] Fix Typo: offest -> offset 
PHPBB3-12887
 2014-07-23 01:27:42 +02:00
Andreas Fischer
f1890fe8e9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12851] Fix the Font colour button title
 2014-07-23 01:12:18 +02:00
Andreas Fischer
9e1802396f Merge pull request #2733 from n-aleha/ticket/12851 
[ticket/12851] Fix the Font colour button title

* n-aleha/ticket/12851:
  [ticket/12851] Fix the Font colour button title
 2014-07-23 01:12:18 +02:00
Dhruv
25c646cbf9 Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12560] Add methods to set upload and temp paths in plupload
 2014-07-22 22:44:22 +05:30
Dhruv Goel
4a6a54472c Merge pull request #2766 from marc1706/ticket/12560 
[ticket/12560] Add methods to set upload and temp paths in plupload
 2014-07-22 22:42:05 +05:30
Joas Schilling
cf88a6453c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
 2014-07-21 22:40:55 +02:00
Joas Schilling
58d91d1d54 Merge pull request #2757 from rxu/ticket/12871 
[ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation

* rxu/ticket/12871:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
 2014-07-21 22:40:02 +02:00
n-aleha
d16ce21926 [ticket/12851] Fix the Font colour button title 
PHPBB3-12851
 2014-07-21 23:36:58 +03:00
Tristan Darricau
f27102b454 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12861] Add event to modify the post, poster and attachment data
 2014-07-21 20:49:02 +02:00
Tristan Darricau
38100cc7c0 Merge pull request #2745 from nickvergessen/ticket/12861 
[ticket/12861] Add event to modify the post, poster and attachment data

* nickvergessen/ticket/12861:
  [ticket/12861] Add event to modify the post, poster and attachment data
 2014-07-21 20:48:30 +02:00
Dhruv
99cbfcb16d Merge branch 'develop-ascraeus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12656] Pass user object into all console commands.
 2014-07-22 00:15:20 +05:30
Dhruv Goel
e11875527d Merge pull request #2752 from bantu/ticket/12656 
[ticket/12656] Pass user object into all console commands for translation
 2014-07-22 00:14:01 +05:30
Dhruv
b30bd79f72 Merge branch 'develop-ascraeus' into develop 
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12448] Fix null columns for MS SQL
  [ticket/12448] Fix null columns for postgres
  [ticket/12448] Allow null as default value for columns
 2014-07-22 00:11:32 +05:30
Dhruv Goel
1c8357a1cb Merge pull request #2651 from nickvergessen/ticket/12448 
[ticket/12448] Allow null as default value for columns
 2014-07-22 00:08:07 +05:30
Marc Alexander
b94ce7b932 [ticket/12560] Add methods to set upload and temp paths in plupload 
The paths will be reset to the default paths after an upload is complete.

PHPBB3-12560
 2014-07-20 21:37:34 +02:00
Marc Alexander
5f1dd968ac Merge branch 'develop-ascraeus' into develop 2014-07-20 18:45:09 +02:00
Marc Alexander
449ffbe799 Merge remote-tracking branch 'tmbackoff/ticket/12872' into develop-ascraeus 2014-07-20 18:44:38 +02:00
Tabitha Backoff
247c5a1808 [ticket/12872] Add poster_id to viewtopic_modify_post_row 
Change "rc3" to "RC3".

PHPBB3-12872
 2014-07-19 05:33:42 -04:00
Tabitha Backoff
f6ad9d5fd2 [ticket/12872] Add poster_id to viewtopic_modify_post_row 
To allow extension authors to use the poster_id var.

PHPBB3-12872
 2014-07-19 03:26:33 -04:00
rxu
7b91b66b87 [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation 
To make it consistent with another config.php constants,
PHPBB_DISPLAY_LOAD_TIME is to be put in config.php during installation as well.

PHPBB3-12871
 2014-07-19 14:09:22 +08:00
Andreas Fischer
d78dc0119e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12748] Fix typo in terms of use
 2014-07-18 22:58:02 +02:00
Andreas Fischer
d5f87e6053 Merge pull request #2755 from Elsensee/ticket/12748 
[ticket/12748] Fix typo in terms of use

* Elsensee/ticket/12748:
  [ticket/12748] Fix typo in terms of use
 2014-07-18 22:58:01 +02:00
Andreas Fischer
88a8176d3a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12663] Have cli.php language file at top level; unrelated to ACP.
  [ticket/12663] Extract CLI language string into their own file
 2014-07-18 00:57:53 +02:00
Andreas Fischer
65544066c2 Merge pull request #2751 from bantu/ticket/12663 
[ticket/12663] Extract CLI language string into their own file

* bantu/ticket/12663:
  [ticket/12663] Have cli.php language file at top level; unrelated to ACP.
  [ticket/12663] Extract CLI language string into their own file
 2014-07-18 00:57:53 +02:00
Andreas Fischer
faabf7787f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12814] Replace email type with text type
 2014-07-18 00:54:22 +02:00
Andreas Fischer
1a66ad8483 Merge pull request #2735 from carlo94it/ticket/12814 
[ticket/12814] Fix field type for LDAP email attribute

* carlo94it/ticket/12814:
  [ticket/12814] Replace email type with text type
 2014-07-18 00:54:21 +02:00
Oliver Schramm
8a5ec8d9d1 [ticket/12748] Fix typo in terms of use 
PHPBB3-12748
 2014-07-18 00:28:24 +02:00
Andreas Fischer
07ce29c081 [ticket/12656] Pass user object into all console commands. 
PHPBB3-12656
 2014-07-17 20:37:24 +02:00
Andreas Fischer
e78a6046ca [ticket/12663] Have cli.php language file at top level; unrelated to ACP. 
PHPBB3-12663
 2014-07-17 16:54:42 +02:00
Carlo
f784510494 [ticket/12663] Extract CLI language string into their own file 
PHPBB3-12663
 2014-07-17 16:53:33 +02:00
Tristan Darricau
d6d02188ad Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12685] Setup class loader for extensions only if not in safe mode
  [ticket/12685] Replace getParameterOption with hasParameterOption
  [ticket/12685] Do not dump container
  [ticket/12685] Override getDefaultInputDefinition()
  [ticket/12685] Removed unused USE statement
  [ticket/12685] Inject console.command_collection instead of the container
  [ticket/12685] Add a new line
  [ticket/12685] Container is dumped by default
  [ticket/12685] Removed spaces
  [ticket/12685] Add --safe-mode
  [ticket/12685] We need extensions enabled
  [ticket/12685] Add space after foreach
  [ticket/12685] Add console collection and fixing CLI
 2014-07-17 16:07:42 +02:00
Tristan Darricau
42477861a4 Merge pull request #2576 from carlo94it/ticket/12685 
[ticket/12685] New CLI container for load extensions

* carlo94it/ticket/12685:
  [ticket/12685] Setup class loader for extensions only if not in safe mode
  [ticket/12685] Replace getParameterOption with hasParameterOption
  [ticket/12685] Do not dump container
  [ticket/12685] Override getDefaultInputDefinition()
  [ticket/12685] Removed unused USE statement
  [ticket/12685] Inject console.command_collection instead of the container
  [ticket/12685] Add a new line
  [ticket/12685] Container is dumped by default
  [ticket/12685] Removed spaces
  [ticket/12685] Add --safe-mode
  [ticket/12685] We need extensions enabled
  [ticket/12685] Add space after foreach
  [ticket/12685] Add console collection and fixing CLI
 2014-07-17 16:03:55 +02:00
Joas Schilling
5dd8a759be Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12860] Fix typo
  [ticket/12860] Add template events mcp_ban_unban
  [ticket/12860] Add template events mcp_ban_fields
 2014-07-17 15:31:26 +02:00
Joas Schilling
0d2a478076 Merge pull request #2747 from Elsensee/ticket/12860 
[ticket/12860] Add template events to mcp_ban.html

* Elsensee/ticket/12860:
  [ticket/12860] Fix typo
  [ticket/12860] Add template events mcp_ban_unban
  [ticket/12860] Add template events mcp_ban_fields
 2014-07-17 15:31:20 +02:00
Carlo
7f4d425006 [ticket/12685] Setup class loader for extensions only if not in safe mode 
PHPBB3-12685
 2014-07-17 00:05:33 +02:00
Oliver Schramm
b1df0cffb1 [ticket/12860] Fix typo 
PHPBB3-12860
 2014-07-17 00:00:02 +02:00
PayBas
2913b44080 [ticket/12857] Add missing template events breadcrumb_prepend 
To insert links after site-home

PHPBB3-12857
 2014-07-16 22:15:31 +02:00
PayBas
c7be452861 [ticket/12857] Add template events breadcrumbs_before/after 
PHPBB3-12857
 2014-07-16 22:15:30 +02:00