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

19221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
371cfa4bfc [ticket/12045] Correctly close <dd> with </dd> 
PHPBB3-12045
 2013-11-28 13:17:07 +01:00
Joas Schilling
f58add8d79 Merge remote-tracking branch 'prototech/ticket/11507' into develop 
* prototech/ticket/11507:
  [ticket/11507] Handle empty sets correctly.
  [ticket/11507] Allow group & unapproved post count options to be used alone.
  [ticket/11507] Fix the unapproved posts count query.
  [ticket/11507] Allow the posts awaiting approval value to be 0.
 2013-11-28 13:12:12 +01:00
Joas Schilling
13bed15363 Merge remote-tracking branch 'prototech/ticket/12040' into develop 
* prototech/ticket/12040:
  [ticket/12040] Prevent AJAX background animation flicker in ACP
 2013-11-28 12:20:56 +01:00
Joas Schilling
3585d167ad Merge remote-tracking branch 'prototech/ticket/11869' into develop 
* prototech/ticket/11869:
  [ticket/11869] Fix strict standards error when registering.
 2013-11-28 12:10:41 +01:00
Cesar G
7da4490402 [ticket/11507] Handle empty sets correctly. 
Using the last parameter in $db->sql_in_set() does not give the correct
behaviour expected here. The query should not be negated if the set is empty.

PHPBB3-11507
 2013-11-27 21:26:23 -08:00
Cesar G
ef2e5ca966 [ticket/11507] Allow group & unapproved post count options to be used alone. 
PHPBB3-11507
 2013-11-27 21:26:22 -08:00
Cesar G
c5656747d8 [ticket/11507] Fix the unapproved posts count query. 
Only unapproved posts should be counted.

PHPBB3-11507
 2013-11-27 21:26:22 -08:00
Cesar G
b41e2d335a [ticket/11507] Allow the posts awaiting approval value to be 0. 
PHPBB3-11507
 2013-11-27 21:26:18 -08:00
Cesar G
83b1278273 [ticket/11869] Fix strict standards error when registering. 
PHPBB3-11869
 2013-11-27 20:05:00 -08:00
Joas Schilling
f3d7823050 [ticket/12042] Replace B with a more meaningful key name 
PHPBB3-12042
 2013-11-27 18:54:51 +01:00
Joas Schilling
6a2d0c345c [ticket/12042] Add all language strings from PLUpload 2.0 to the language file 
PHPBB3-12042
 2013-11-27 18:09:38 +01:00
Joas Schilling
e3eb82cf7d Merge remote-tracking branch 'Marc/ticket/11914' into develop 
* Marc/ticket/11914:
  [ticket/11914] Add assets version to included plupload scripts
  [ticket/11914] Update plupload to 2.0.0
  [ticket/11914] Use unix line endings in plupload queue css file
 2013-11-27 15:18:39 +01:00
Marc Alexander
33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842 
Conflicts:
	phpBB/includes/acp/acp_groups.php
 2013-11-27 14:55:24 +01:00
Cesar G
680f8eae50 [ticket/12040] Prevent AJAX background animation flicker in ACP 
PHPBB3-12040
 2013-11-26 10:18:53 -08:00
Joas Schilling
125e76f9aa Merge remote-tracking branch 'prototech/ticket/12036' into develop 
* prototech/ticket/12036:
  [ticket/12036] Re-add missing move up button to module management page.
 2013-11-26 14:52:32 +01:00
Joas Schilling
c49e7387d6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html
 2013-11-26 11:33:17 +01:00
Joas Schilling
afb4585dd9 Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus 
* prototech/ticket/12037:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.
 2013-11-26 11:31:43 +01:00
Cesar G
e111d7bd13 [ticket/12037] Fix hard-coded text in acp_inactive.html. 
PHPBB3-12037
 2013-11-25 12:38:53 -08:00
Cesar G
95e380ec18 [ticket/12036] Re-add missing move up button to module management page. 
PHPBB3-12036
 2013-11-25 11:56:09 -08:00
Marc Alexander
0d4bf3ff45 [ticket/11842] Use type map for updating avatar types in database 
PHPBB3-11842
 2013-11-25 13:12:08 +01:00
Marc Alexander
c9c419c431 [ticket/11912] Expect logic exceptions in test if no guesser available 
PHPBB3-11912
 2013-11-23 01:19:43 +01:00
Marc Alexander
b5e6d107ae [ticket/11842] Add missing prefix for group id in avatar data 
PHPBB3-11842
 2013-11-23 01:05:39 +01:00
Marc Alexander
943ab555da Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912 
Conflicts:
	phpBB/config/services.yml
 2013-11-23 00:54:56 +01:00
Marc Alexander
e108418824 [ticket/11912] Check if content_guesser is supported with function_exists 
PHPBB3-11912
 2013-11-23 00:51:29 +01:00
Joas Schilling
2f4d15015e [ticket/10910] Do not add size when its 1 (default) 
PHPBB3-10910
 2013-11-22 15:52:59 +01:00
Joas Schilling
8c73c9658e [ticket/10910] Fix unit tests 
PHPBB3-10910
 2013-11-22 15:51:22 +01:00
Mario Skouat
9861cd21dd [ticket/10910] Add unit tests for select 
PHPBB3-10910
 2013-11-22 15:04:39 +01:00
Mario Skouat
3a00cb0c08 [ticket/10910] Allow setting size selects in build_cfg_template() 
PHPBB3-10910
 2013-11-22 15:02:44 +01:00
Nils Adermann
0d0b2627f7 Merge pull request #1886 from nickvergessen/ticket/12027 
[Ticket/12027] List redis as service in .travis.yml
 2013-11-22 03:24:49 -08:00
Joas Schilling
a3df2cb454 [ticket/12027] List redis as service in .travis.yml 
PHPBB3-12027
 2013-11-22 10:26:05 +01:00
Nathan Guse
6e842f11fc Merge pull request #1884 from nickvergessen/ticket/12015-2 
[ticket/12015] Fix variable name and event version
 2013-11-21 14:56:05 -08:00
Joas Schilling
2a154d0a10 [ticket/12015] Fix variable name and event version 
PHPBB3-12015
 2013-11-21 23:42:40 +01:00
Matt Friedman
7f890ebed7 [ticket/12014] Change event date in docs 
PHPBB3-12014
 2013-11-21 14:31:43 -08:00
Nathan Guse
5220013f9d Merge pull request #1883 from s9e/ticket/12028 
[ticket/12028] Replace L_COLON with literal colon
 2013-11-21 14:24:56 -08:00
Nathan Guse
b64d94b6bc Merge pull request #1870 from nickvergessen/ticket/12015 
Ticket/12015 Enhance events in viewtopic to increase their usability
 2013-11-21 14:21:31 -08:00
s9e
263f213ffe [ticket/12028] Replace L_COLON with literal colon 
Replace L_COLON with literal colon in JavaScript context.

[ci skip]

PHPBB3-12028
 2013-11-21 23:20:16 +01:00
Joas Schilling
e9e667762b [ticket/12015] Fix english grammar 
PHPBB3-12015
 2013-11-21 23:18:29 +01:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005 
[ticket/12005] Remove code responsible for PM popup completely
 2013-11-21 14:01:23 -08:00
Nathan Guse
be33d37c89 Merge pull request #1856 from prototech/ticket/12001 
[ticket/12001] Ensure that form data is sent to server in AJAX requests.
 2013-11-21 13:56:03 -08:00
Nathan Guse
38994965f2 Merge pull request #1860 from prototech/ticket/12010 
[ticket/12010] Make the navbar icons clickable.
 2013-11-21 13:53:02 -08:00
Nathan Guse
355ceac4a0 Merge pull request #1834 from cyberalien/ticket/11984 
Move responsive design adjustments
 2013-11-21 13:42:48 -08:00
Nathan Guse
6f419b0049 Merge pull request #1869 from prototech/ticket/10810 
[ticket/10810] Move color swatches from popup windows to inline blocks.
 2013-11-21 13:41:03 -08:00
Nathan Guse
20885ccb8c Merge pull request #1882 from prototech/ticket/11959 
[ticket/11959] Trim the list of users from post notifications.
 2013-11-21 13:27:52 -08:00
Nathan Guse
6403d6848e Merge pull request #1878 from blitze/ticket/12024 
[ticket/12024] Template event overall_header_content_before
 2013-11-21 13:26:24 -08:00
Cesar G
e3a28e5e2a [ticket/11959] Rename $extra_cnt to something more descriptive. 
PHPBB3-11959
 2013-11-21 13:18:28 -08:00
Cesar G
43f454a6c6 [ticket/11959] Use COMMA_SEPARATOR to join the user list. 
PHPBB3-11959
 2013-11-21 13:15:08 -08:00
Nathan Guse
7c1c870852 Merge pull request #1881 from prototech/ticket/11484 
[ticket/11484] Display login box for users following email notification link.
 2013-11-21 13:04:46 -08:00
Cesar G
bcf347420e [ticket/11959] Trim the list of users from post notifications. 
PHPBB3-11959
 2013-11-21 13:02:26 -08:00
Cesar G
44b6f45759 [ticket/11484] Display login box for users following email notification link. 
The link used for the latest post now uses view=unread so redirecting the user
using the value for the e parameter is no longer necessary.

PHPBB3-11484
 2013-11-21 08:11:17 -08:00
Cesar G
6d45146df7 [ticket/11672] Move the reapply_sid() call before meta_refresh() is called. 
The $redirect assignment is not necessary because the variable  has already been
set near the start of the functions. The redirect value will also never default
to index.php because a default value has already been provided when $redirect
is initially assigned and passed to the template as a hidden field.

PHPBB3-11672
 2013-11-21 04:45:16 -08:00