makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 05:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
24721 commits 18 branches 192 tags 207 MiB
Commit graph

25 commits

Author SHA1 Message Date
Marc Alexander
98eeaacc36 [ticket/12895] Rename user style setting to resolve conflict with style param 
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895
 2014-07-29 13:24:44 +02:00
Marc Alexander
91a1c3af90 [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay() 
PHPBB3-12372
 2014-04-07 21:42:30 +02:00
Marc Alexander
966a2b4892 [ticket/12372] Move dE() function core.js 
PHPBB3-12372
 2014-04-07 21:27:48 +02:00
Marc Alexander
ad98a070c3 [ticket/12372] Unify definition of function dE() across all files 
PHPBB3-12372
 2014-04-07 20:43:32 +02:00
Matt Friedman
dacca5657a [ticket/11747] Use _prepend and _append for template events 
PHPBB3-11747
 2013-07-26 22:25:27 -07:00
Matt Friedman
cd329c55a7 [ticket/11747] ucp_prefs_personal template events 
PHPBB3-11747
 2013-07-26 18:31:05 -07:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-12-07 21:14:39 -06:00
Oleg Pudeyev
b07ae3fe59 Merge PR #1053 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP

Conflicts:
	phpBB/includes/ucp/ucp_prefs.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
 2012-12-05 12:21:25 -05:00
Oleg Pudeyev
0793f8e2e6 [ticket/10841] Revert whitespace changes. 
PHPBB3-10841
 2012-12-05 12:07:37 -05:00
Senky
af064cdaad [ticket/10841] Modifying style and language selectors in UCP 
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
 2012-12-05 12:07:37 -05:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2012-11-10 10:58:44 -06:00
Nathan Guse
6e7e70a18a [ticket/10780] Replace colon usage in template output with {L_COLON} 
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
 2012-11-10 00:23:03 +01:00
Nathan Guse
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences 
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
 2012-10-20 22:11:41 -05:00
Nathan Guse
6ded18b6e2 [ticket/11103] subsilver2 ucp_prefs_personal.html edits 
PHPBB3-11103
 2012-10-14 13:26:33 -05:00
Joas Schilling
a6bace039a [feature/new-tz-handling] Fix timezone selection in subsilver2 
PHPBB3-9558
 2012-06-18 15:09:25 +02:00
Oleg Pudeyev
56a7038aa5 [feature/new-tz-handling] Removed DST options from templates. 
PHPBB3-9558
 2012-03-14 22:57:31 -04:00
Meik Sievertsen
e3882844ec #i62 - #i65 
gone through every javascript invocation and making sure we adhere to our coding guidelines.


git-svn-id: file:///svn/phpbb/trunk@8099 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-22 18:31:50 +00:00
Meik Sievertsen
75a5162945 again, a lot of bug fixes 
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-19 20:38:38 +00:00
Henry Sudhof
6813967ae1 Changing the behaviour of the hideonline permission. 
Test the current setting before altering the memory limit during install(Bug #12195)

And another language var.


git-svn-id: file:///svn/phpbb/trunk@7755 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-06-14 15:03:52 +00:00
Meik Sievertsen
4ed8b3a62c ahhh, there are you. I can see a new haircut... looks good. 
git-svn-id: file:///svn/phpbb/trunk@7263 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-04-01 22:46:14 +00:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline 
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
 2010-11-11 19:10:55 +01:00
Nils Adermann
c69936d220 [task/restore-subsilver2] Revert removing subsilver2 for Ascraeus development. 
This reverts commit ac2b5430aa.

PHPBB3-9783
 2010-08-20 22:55:25 +02:00
Nils Adermann
ac2b5430aa [task/drop-subsilver2] Removing subsilver2 for Ascraeus development. 
The discussion about this has taken place on area51:
    http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32496

PHPBB3-9607
 2010-05-16 20:57:01 +02:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk 
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-10-04 18:14:59 +00:00
Meik Sievertsen
e85f9f79bc remove no longer necessary files... hooray 
git-svn-id: file:///svn/phpbb/trunk@9221 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-12-24 13:14:24 +00:00