mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
19,661 Commits 17 Branches 190 Tags
Commit Graph

19661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
578d5abbf3 Merge pull request #1965 from prototech/ticket/12137 
[ticket/12137] Fix spacing in smiley block.

* prototech/ticket/12137:
  [ticket/12137] Fix spacing in smiley block.
 2014-01-27 03:16:52 +01:00
Cesar G
f6d338fd8b [ticket/12137] Fix spacing in smiley block. 
PHPBB3-12137
 2014-01-26 18:11:16 -08:00
Andreas Fischer
9b500538e3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
 2014-01-26 20:51:55 +01:00
Andreas Fischer
0d6e587fda Merge remote-tracking branch 'vinny/ticket/12118' into develop-olympus 
* vinny/ticket/12118:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
 2014-01-26 20:50:40 +01:00
Cesar G
525f1be319 [ticket/12131] Remove invalid imageset var in viewtopic print view. 
PHPBB3-12131
 2014-01-26 01:03:49 -08:00
Marcus Vinicius
cb7a0d6f2a [ticket/12118] Add noindex meta tag to subsilver2 view-print templates 
PHPBB3-12118
 2014-01-26 03:19:43 -03:00
Cesar G
ff9e16950b [ticket/12123] Add soft delete to phpbb/permissions.php. 
PHPBB3-12123
 2014-01-25 16:22:01 -08:00
Cesar G
10149933bd [ticket/12124] Remove double bang. 
PHPBB3-12124
 2014-01-25 15:26:37 -08:00
Cesar G
a8a349670a [ticket/12124] Revert to basic uploader if the html5 runtime is not supported. 
PHPBB3-12124
 2014-01-24 04:37:29 -08:00
Joas Schilling
e91a45df33 Merge remote-tracking branch 'prototech/ticket/12125' into develop 
* prototech/ticket/12125:
  [ticket/12125] Specify nth-child selectors separately - IE8 does not like them
 2014-01-24 13:35:34 +01:00
Cesar G
8620f1e619 [ticket/12125] Specify nth-child selectors separately - IE8 does not like them 
PHPBB3-12125
 2014-01-24 04:30:14 -08:00
Cesar G
4c102322c1 Merge branch 'develop-olympus' into develop 2014-01-23 14:13:34 -08:00
Cesar G
ed409d3d5b Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus 2014-01-23 14:10:46 -08:00
Joas Schilling
42e4566fe4 [ticket/12120] Restore alphabetic order 
PHPBB3-12120
 2014-01-23 22:59:42 +01:00
Joas Schilling
a672d983c9 [ticket/12120] Add prototech to authors 
PHPBB3-12120
 2014-01-23 22:59:33 +01:00
Joas Schilling
79089ad7fe Merge remote-tracking branch 'EXreaction/ticket/11950' into develop 
* EXreaction/ticket/11950:
  [ticket/11950] Fix prior commit
 2014-01-22 18:29:29 +01:00
Nathan Guse
5b452ffe27 [ticket/11950] Fix prior commit 
PHPBB3-11950
 2014-01-22 10:43:29 -06:00
Nathan Guse
026272967a Merge pull request #1952 from suheb/ticket/11950 
Ticket/11950 - Added 'forgot password' link to index page.
 2014-01-22 07:34:57 -08:00
Suhaib Khan
88bd88b612 Adding 'forgot password' link to index page 
PHPBB3-11950

Signed-off-by: Suhaib Khan <suhebjerk@gmail.com>
 2014-01-22 12:42:33 +05:30
Joas Schilling
12932e8113 [ticket/11201] Use !== null, its faster 
PHPBB3-11201
 2014-01-20 00:15:06 +01:00
Joas Schilling
430a0c1c21 [ticket/11201] Also translate profile fields in UCP and ACP 
PHPBB3-11201
 2014-01-19 17:58:12 +01:00
Joas Schilling
4213b93cde [ticket/11201] Add parameters and variables to profile field class 
PHPBB3-11201
 2014-01-19 15:00:26 +01:00
Joas Schilling
ec8fd57f28 [ticket/11201] Add commas on last array entry 
PHPBB3-11201
 2014-01-19 14:55:47 +01:00
Joas Schilling
0ce98d7eac [ticket/11201] Allow translation of profile field name and explanation 
PHPBB3-11201
 2014-01-19 14:52:51 +01:00
Joas Schilling
45ab32bf61 Merge remote-tracking branch 'EXreaction/ticket/11902' into develop 
* EXreaction/ticket/11902:
  [ticket/11902] Use phpbb\php\ini class
  [ticket/11902] Prevent errors if set_time_limit disabled
  [ticket/11902] Set max execution time to 0 in db update
 2014-01-18 21:42:30 +01:00
Joas Schilling
dea91108fe Merge remote-tracking branch 'EXreaction/ticket/12006' into develop 
* EXreaction/ticket/12006:
  [ticket/12006] global $phpbb_dispatcher;
  [ticket/12006] Missing a space
  [ticket/12006] Add module_auth event
  [ticket/12006] Test for ext module auth
  [ticket/12006] Add extension enabled check token to module auth
  [ticket/12006] Cleanup the module auth function token replacement code
 2014-01-18 21:20:01 +01:00
Joas Schilling
f40f774b2e [ticket/11201] Fix some variable names 
PHPBB3-11201
 2014-01-18 13:28:17 +01:00
Joas Schilling
ad8d4492a7 [ticket/11201] Add tables to constructor in tests 
PHPBB3-11201
 2014-01-18 13:16:28 +01:00
Joas Schilling
197e026699 [ticket/11201] Add a method to return the translated full name of the type 
PHPBB3-11201
 2014-01-18 13:16:18 +01:00
Joas Schilling
df85364baa [ticket/11201] Remove db depending code from field class 
sql_build_array() should already take care of that

PHPBB3-11201
 2014-01-18 13:01:29 +01:00
Joas Schilling
b1bed49eae [ticket/11201] Add variables to classes and add constructor doc blocks 
PHPBB3-11201
 2014-01-18 12:53:41 +01:00
Joas Schilling
7fac238398 [ticket/11201] Update copyright in class file 
PHPBB3-11201
 2014-01-18 12:47:19 +01:00
Joas Schilling
7a8818fbc6 [ticket/11201] Add visibility and remove unused variable 
PHPBB3-11201
 2014-01-18 12:46:48 +01:00
Joas Schilling
1c884d07eb [ticket/11201] Add some commas at the last array entry 
PHPBB3-11201
 2014-01-18 12:44:24 +01:00
Joas Schilling
876e5e5fbb [ticket/11201] Cast some variables to integer 
PHPBB3-11201
 2014-01-18 12:40:12 +01:00
Joas Schilling
431fa7b593 [ticket/11201] Inject table names rather then using constants 
PHPBB3-11201
 2014-01-18 12:36:18 +01:00
Nathan Guse
ab41396707 Merge pull request #1866 from prototech/ticket/11915 
[ticket/11915] Improve Plupload integration
 2014-01-17 19:28:31 -08:00
Nathan Guse
efd56bc981 Merge pull request #1861 from prototech/ticket/12011 
[ticket/12011] RTL fixes.
 2014-01-17 19:27:50 -08:00
Cesar G
ebc2d1dd1b [ticket/11915] Pass the data to the template instead of scraping HTML for it. 
PHPBB3-11915
 2014-01-17 19:25:12 -08:00
Cesar G
9a21dec1b6 [ticket/11915] Replace inline onclick event for inserting attachment bbcodes. 
PHPBB3-11915
 2014-01-17 19:25:11 -08:00
Cesar G
702efc8496 [ticket/11915] Remove files that are no longer used. 
PHPBB3-11915
 2014-01-17 19:25:11 -08:00
Cesar G
c1cca8aff4 [ticket/11915] Hide attachments table when removing last failed file. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
628323a80a [ticket/11915] Remove unused language string. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
020b7a31bf [ticket/11915] Make the user aware of the drag-and-drop zone. 
PHPBB3-11915
 2014-01-17 19:20:37 -08:00
Cesar G
1fedad5e07 [ticket/11915] Fix the Plupload test. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
8b351104ed [ticket/11915] Check if trigger_error() was called after sending chunk. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
a70f08513d [ticket/11915] Fix spacing and ensure that strings are translated. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
f858ec1f56 [ticket/11915] Fix various problems with responsive design. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
9c1cacae42 [ticket/11915] Provide the URL to the attachment when it's uploaded. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00
Cesar G
708622a0bb [ticket/11915] Do not display the "Place inline" button when JS is disabled. 
PHPBB3-11915
 2014-01-17 19:20:36 -08:00