mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-26 21:21:32 +01:00
Code Issues Releases Wiki Activity
12,472 Commits 10 Branches 193 Tags
5e0b4e63d032151d230b6eb44ee107835af0712a
Commit Graph

181 Commits

Author SHA1 Message Date
Igor Wiedler
d4e00b6c0d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
 2012-02-07 16:57:09 +01:00
Vjacheslav Trushkin
326ff46ef7 [ticket/10616] Add template inheritance to exported template 
Add template inheritance when exporting template.cfg

PHPBB3-10616
 2012-02-03 16:19:42 +02:00
Oleg Pudeyev
466acfdd94 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10563] Show deactivated styles below active styles in acp
 2012-01-06 02:46:52 -05:00
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp 
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
 2012-01-02 21:07:40 +02:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2012-01-02 19:10:27 +01:00
Andreas Fischer
69a725198b Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop 
* unknownbliss/ticket/9916:
  [ticket/9916] Updating header license and removing Version $Id$
 2012-01-02 17:54:54 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Oleg Pudeyev
48463cba2e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-24 00:57:36 -05:00
Oleg Pudeyev
519db8e3b2 Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympus 
* cyberalien/ticket/10507:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp
 2011-12-24 00:57:07 -05:00
Andreas Fischer
124ff6c50a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10531] Disallow deleting of the last style

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-16 16:19:22 +01:00
Joas Schilling
0cfa843677 [ticket/10531] Disallow deleting of the last style 
Regression from PHPBB3-9675 commit 0e02f5cb0b

PHPBB3-9675
PHPBB3-10531
 2011-12-15 23:17:16 +01:00
David King
a3e8d3b00b [ticket/10463] removed extra comma in malformed query in acp_styles.php 
PHPBB3-10463
 2011-12-15 13:22:04 +00:00
Vjacheslav Trushkin
cd4958f72c [ticket/10507] Sort styles in acp 
Sort styles by name in admin control panel

PHPBB3-10507
 2011-12-15 14:44:09 +02:00
Chris Smith
7b7a56dc4a [feature/remove-db-styles] Remove forgotten template variables. 
PHPBB3-9741
 2011-09-20 23:15:30 +01:00
Chris Smith
ee994b2968 [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71. 
PHPBB3-9741
 2011-09-20 23:01:55 +01:00
Chris Smith
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable. 
PHPBB3-9741
 2011-09-20 22:18:06 +01:00
Chris Smith
934a9da313 [feature/remove-db-styles] Remove style.php DB storage. 
Removed all use of the DB for serving/caching the theme from style.php,
acp_style no longer stores the theme modified time either.

As a consequence currently all stylesheets will be served through style.php
(with no caching) until imagesets are removed [PHPBB3-10336], then
they can we served as static files by HTTPd.

PHPBB3-9741
 2011-09-20 21:06:52 +01:00
Chris Smith
c2d6c613d3 [feature/remove-db-styles] ACP has forgotten how to store themes in the DB. 
PHPBB3-9741
 2011-09-20 21:06:52 +01:00
Chris Smith
ad11565ace [feature/remove-db-styles] Missed a few template DB bits in acp_styles. 
PHPBB3-9741
 2011-09-20 21:06:52 +01:00
Chris Smith
23415170cb [feature/remove-db-styles] Removing unused methods from acp_style. 
These got left behind in 6854d47.

PHPBB3-9741
 2011-09-20 21:06:52 +01:00
Chris Smith
9e4349e7fa [feature/remove-db-styles] Removed database storage of style components. 
The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6c.

PHPBB3-9741
 2011-09-20 21:06:51 +01:00
Vjacheslav Trushkin
98590201d8 [feature/remove-imagesets] Changing admin control panel styles module 
Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
 2011-09-03 18:57:16 +03:00
Andreas Fischer
79af1da0a5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10250] The site_logo hash is different depending on imageset & language
  [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset
  [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used
  [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
 2011-07-07 20:06:26 +02:00
Nils Adermann
8ec737e9c4 [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset 
PHPBB3-10250
 2011-07-05 19:38:15 -04:00
Oleg Pudeyev
dfbbc4797e [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable. 
PHPBB3-10148
 2011-04-24 01:35:09 -04:00
rxu
9a9b156a8e [ticket/10035] ACP template edit feature allows to read any files on webserver. 
... and to upload/execute any script on it. Use preg_replace to filter filename

PHPBB3-10035
 2011-03-07 21:22:33 +07:00
Joas Schilling
65020fd5c1 [ticket/9675] Correctly check whether the style/component is still in use. 
And don't allow to delete it in that case.

PHPBB3-9675
 2011-02-08 14:57:43 +01:00
Joas Schilling
0e02f5cb0b [ticket/9675] Put the code into methods to avoid code duplication. 
PHPBB3-9675
 2011-02-08 14:57:42 +01:00
Joas Schilling
ffcd307746 [ticket/9675] Add option to delete template/theme/imageset when deleting style. 
PHPBB3-9675
 2011-02-08 14:27:27 +01:00
Andreas Fischer
250c04c8d5 Merge branch 'ticket/nickvergessen/7296' into develop-olympus 
* ticket/nickvergessen/7296:
  [ticket/7296] Exporting styles to tar creates corrupted archives.
 2010-08-28 23:25:14 +02:00
Andreas Fischer
dfd3c4a5df Merge branch 'ticket/nickvergessen/9519' into develop-olympus 
* ticket/nickvergessen/9519:
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
  [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
 2010-08-28 23:25:05 +02:00
Joas Schilling
3cbcff56b2 [ticket/7296] Exporting styles to tar creates corrupted archives. 
Add the folders to the archive before putting the files inside, seems to break
the tar-archives.

PHPBB3-7296
 2010-08-22 11:16:19 -04:00
Josh Woody
c3a5fd30ee [ticket/9646] Honor CSS comments in @import statements 
Add a basic CSS comment parser that allows comments to prevent loading an
@import statement. For simplicity, only whitespace is allowed between /* and
the @import. Also adjust regex to not parse improper quotation marks.

PHPBB3-9646
PHPBB3-8169
 2010-08-20 16:02:58 -05:00
Joas Schilling
4c95ed0eeb [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). 
acm_memory.php is untested. install/install_convert.php and
includes/functions_convert.php are going to be tested and committed afterwards.

PHPBB3-9519
 2010-08-10 16:11:39 +02:00
Joas Schilling
4349bec316 [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) 
introduced in r10496 and r10360/r10361
 2010-03-13 11:37:06 +01:00
Andreas Fischer
ba1d50559f Fix r10360, Bug #55665 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10361 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-22 16:56:55 +00:00
Joas Schilling
1261e21eac Bug #55665 - Restrict search for styles/../style.cfg to folders. 
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10360 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-21 22:29:28 +00:00
Meik Sievertsen
fe6cb1489c Fix wrong error message for non-writable template file in acp_styles.php - Bug #50045 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10074 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-31 11:25:28 +00:00
Chris Smith
2e8d14004f Coding guidelines in r9629 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9720 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-07 10:52:59 +00:00
Andreas Fischer
5d6dca16a7 Fix bug #47345 - Check if template file is empty before trying to read from it. 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9682 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-26 10:47:19 +00:00
Gabriel Vazquez
7cebffe72f Fixed bug #14304 
Authorised by: AcydBurn 

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9629 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-19 14:58:21 +00:00
Joas Schilling
ef0eed4d9e Fix bug #46145 - Template cache error for files of template-subfolders 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9600 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-16 16:13:53 +00:00
Andreas Fischer
2af8393d0f Fix bug #45705 - Show error in the ACP when template folder is not readable. 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9565 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-08 22:33:30 +00:00
Henry Sudhof
ddb5a5f146 late fix for #45135 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9514 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-05-13 10:19:43 +00:00
Meik Sievertsen
b1597679c2 add missing $super assignment - Bug #43635 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9458 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-17 14:58:16 +00:00
Henry Sudhof
ea3c9282b0 #43965 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9447 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-13 14:16:26 +00:00
Henry Sudhof
fbed7386ea #43965 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9446 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-13 13:51:18 +00:00
Henry Sudhof
3e6fbb1c6d Inherit the bitfield 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9408 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-26 13:00:49 +00:00
Meik Sievertsen
0ebe5b4b6a #42985 - use path in JS instead of name 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9381 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-17 11:40:56 +00:00
Meik Sievertsen
169a228899 Fix imageset editing for retaining and correctly setting dimensions for images, as well as displaying correct settings for first page load. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9360 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-07 16:02:17 +00:00