1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 14:16:28 +02:00
Commit Graph

35 Commits

Author SHA1 Message Date
fd55c8664a Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
2012-04-10 21:46:14 +05:30
fa04c3712b [ticket/10734] Moved style elements and fixed minor bugs
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store

PHPBB-10734
2012-04-09 18:43:54 +05:30
8363d32765 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
2012-04-02 16:20:21 +03:00
17e050e109 [ticket/10699] Long h2 title breaks div.minitabs in MCP
Fixed minor issues in formatting.

PHPBB3-10699
2012-04-02 16:59:05 +05:30
42101fe8d4 [ticket/10699] Long h2 title breaks div.minitabs in MCP
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
2012-04-02 16:26:23 +05:30
3ced1d2bfc [ticket/10734] Removed all the unnecessary corner classes
Removed the corner span classes from all the template and theme files.

PHPBB-10734
2012-04-02 16:15:55 +05:30
ae824aef12 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10730] Added label tag around "select" text in post splitting UI
2012-03-28 23:24:06 -04:00
fff9f6611e [ticket/10730] Added label tag around "select" text in post splitting UI
Added label tags around the "select" text in the post splitting UI in the MCP.
Had to add IDs based on the post ID to the select boxes to allow label to
work. Tested in Firefox and Chrome.

PHPBB3-10730
2012-03-29 04:16:34 +02:00
1fa39ea722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page
PHPBB3-8636
2012-02-23 10:55:57 +01:00
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +02:00
c651948cb3 [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
PHPBB3-9630
2011-05-02 23:54:35 -04:00
2a8cd76f59 Fixed Bug #44455 - Properly display post status messages in topic when post is reported and unapproved
Authorised by: AcydBurn 

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9670 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-24 13:39:34 +00:00
723d4c5628 Fixed Bug #39845 - [Change] "Post details" links with image in MCP.
Authorised by: AcydBurn 

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9664 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-24 02:51:19 +00:00
bb16650a89 #40435
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9330 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-17 13:04:19 +00:00
6accc46024 some language/style/code fixes (refer to the diff of the changelog)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8389 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-23 13:18:33 +00:00
35f205ea61 #15038
I'm very sorry. This should make W3C happy again.


git-svn-id: file:///svn/phpbb/trunk@8227 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-05 19:07:10 +00:00
4defd8a830 Ok, here comes a big one. Poor updater. Also requires testing.
#i91
#i92
#i93
#i94
#i95
#i96


git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-03 15:05:54 +00:00
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
052025bb1f -#14438
-Refactor the confirm table cleanup
-Add confirm table cleanup to session garbage collection. Might require own pseudo-cron.


git-svn-id: file:///svn/phpbb/trunk@8089 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-13 15:15:27 +00:00
bd33acd012 some fixes
git-svn-id: file:///svn/phpbb/trunk@7866 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-11 15:03:06 +00:00
455536773f ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-09 11:11:20 +00:00
456586475b oh my god - what did he do? Adding attachment display to post/topic review, queue, reports, post details, mcp topic view... fixing other tiny things along the line.
git-svn-id: file:///svn/phpbb/trunk@7642 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-19 12:04:22 +00:00
c0caf7652f Fixing some tiny bugs...
- correctly close span tags within code=php


git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-17 14:59:33 +00:00
43f42accdb #11010
git-svn-id: file:///svn/phpbb/trunk@7600 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-16 02:37:10 +00:00
a0a44aeee4 #10940
git-svn-id: file:///svn/phpbb/trunk@7582 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-15 13:15:40 +00:00
6205be1e74 #9828, #10545, #10541, #10533, #10529, #10527, #10521, #10503, #10481
- more label fixes
- simpler approach to get input cursor text


git-svn-id: file:///svn/phpbb/trunk@7485 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-06 15:31:39 +00:00
550f270a00 #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)


git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-22 15:27:40 +00:00
f610ed82cb say hello to prosilver... YAAAYEEEE
git-svn-id: file:///svn/phpbb/trunk@7260 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-01 22:05:42 +00:00
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
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
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
4cbf6bc703 Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-22 16:34:26 +00:00
ae9c4068e7 Deprecate S_ROW_COUNT, remove *really* old assignments from the code
git-svn-id: file:///svn/phpbb/trunk@9107 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 07:22:28 +00:00
2cedbbac09 merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-23 14:23:34 +00:00