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
21,813 Commits 10 Branches 193 Tags
d3db8b6565763f2d3ba9224051fe7b2d53389dd3
Commit Graph

64 Commits

Author SHA1 Message Date
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers 
PHPBB3-12594
 2014-05-27 20:51:13 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files 
PHPBB3-12456
 2014-04-29 15:44:17 +02:00
Crizzo
0c02eae1ad [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php 
PHPBB3-11787
 2014-03-13 20:58:05 +01:00
Nils Adermann
0ef95a7009 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php
 2013-07-13 13:16:58 -04:00
Marc Alexander
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com 
PHPBB3-11112
 2013-07-12 16:24:27 -04:00
Senky
3741e99aab [ticket/10161] all "e-mail" strings in language files changed to "email" 
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
 2012-04-15 20:10:51 +02:00
David King
29a904ce45 Merge branch 'develop-olympus' into develop 
Conflicts:
	phpBB/language/en/acp/common.php
 2012-03-29 20:43:03 -04:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. 
PHPBB3-10129
 2012-03-24 15:13:04 +00:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Andreas Fischer
f4f82ac5bd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10511] Fix a grammar defect in permissions language.
 2011-12-08 22:22:29 +01:00
Andreas Fischer
7ae12df3d2 Merge remote-tracking branch 'p/ticket/10511' into develop-olympus 
* p/ticket/10511:
  [ticket/10511] Fix a grammar defect in permissions language.
 2011-12-08 22:22:22 +01:00
Andreas Fischer
a8ee32a66b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9876] Distinctly name user and forum roles for newly registered users.
 2011-12-08 22:22:06 +01:00
Oleg Pudeyev
5b9c835127 [ticket/9876] Distinctly name user and forum roles for newly registered users. 
PHPBB3-9876
 2011-12-03 17:44:58 -05:00
Oleg Pudeyev
0ad81a4cdc [ticket/10511] Fix a grammar defect in permissions language. 
PHPBB3-10511
 2011-12-03 17:42:10 -05:00
Andreas Fischer
54362bbe2b Adjustment to r9887: Only use one language variable. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10017 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-18 14:37:49 +00:00
Andreas Fischer
1b8a1f73d7 [Feature] Ability to copy permissions from one forum to several other forums. 
[Fix] Add log entry when copying forum permissions.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9887 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-28 22:09:46 +00:00
Meik Sievertsen
660ef4e43a the permission setting is meant, not the word never. :) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9650 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-22 09:13:42 +00:00
Joas Schilling
37a054897f Fix bug #37235 - Correctly describe founder permissions on trace-information 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9642 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-21 10:46:28 +00:00
Meik Sievertsen
433de350c0 - [Feature] New &quot;Newly Registered Users&quot; group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts. 
- [Feature] Ability to define if the &quot;Newly Registered Users&quot; group will be assigned as the default group to newly registered users.

As a coincidence also Bug #46535 got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-20 18:45:16 +00:00
Meik Sievertsen
3a7758da68 #36405 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9443 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-12 13:28:12 +00:00
Meik Sievertsen
12e59cf347 Ticket #16945 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8288 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-12-27 16:27:24 +00:00
Meik Sievertsen
e8b2c4128e some tiny bugfixes 
git-svn-id: file:///svn/phpbb/trunk@8155 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-08 14:38:44 +00:00
Meik Sievertsen
7d84cac202 #14621 
#14596
info file changes


git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-04 15:08:22 +00:00
Meik Sievertsen
cda8083ba7 fixing some bugs 
git-svn-id: file:///svn/phpbb/trunk@8075 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-02 17:24:56 +00:00
Meik Sievertsen
3585dbd42c a bunch of fixes 
git-svn-id: file:///svn/phpbb/trunk@7884 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-14 15:44:10 +00:00
Meik Sievertsen
38e08367d2 label changes, language fixes... 
git-svn-id: file:///svn/phpbb/trunk@7608 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-16 14:45:13 +00:00
Meik Sievertsen
26cf5c195d some language fixes reported. 
git-svn-id: file:///svn/phpbb/trunk@7570 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-14 15:05:32 +00:00
Meik Sievertsen
c1a738ce5f punctuation changes in language files 
git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-10 15:31:35 +00:00
Meik Sievertsen
f7b51337c5 some language-specific adjustements 
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)


git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-05-03 14:29:22 +00:00
Meik Sievertsen
fc295f5f0e checking in some fixes. ;) Most of them are really minor, including: 
- correctly enter report notification into db
- fix double-quote pm issue


git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-04-26 18:41:26 +00:00
Meik Sievertsen
b63745fdb3 my take on getting the bugs down... thanks to those also providing (usable) solutions to the problem. ;) Of course also to those reporting generally... 
git-svn-id: file:///svn/phpbb/trunk@7330 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-04-12 16:20:39 +00:00
David M
bcecae8993 - made prune a bit nicer 
#8236


git-svn-id: file:///svn/phpbb/trunk@7059 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-02-25 06:08:39 +00:00
Meik Sievertsen
e855a348e3 - fixed some convertor bugs 
- adjusted forum standard access (+polls) role to include f_delete (no update, only new installations will have the change included)


git-svn-id: file:///svn/phpbb/trunk@7040 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-02-23 13:50:27 +00:00
Jonathan Stanley
756907cbc6 #7114 ... blablabla 
git-svn-id: file:///svn/phpbb/trunk@6922 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-01-24 00:58:45 +00:00
Meik Sievertsen
576bb754e9 fixing some bugs, most being submitted grammatical/spelling errors. 
git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-01-21 18:33:45 +00:00
Dominik Dröscher
348edb41d9 hmmm ... 
git-svn-id: file:///svn/phpbb/trunk@6889 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-01-16 23:20:26 +00:00
David M
3a2a61baa4 #6772 
- some other random things


git-svn-id: file:///svn/phpbb/trunk@6880 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-01-11 05:44:22 +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
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
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
Meik Sievertsen
1042152a55 Merge changes made in revisions #r9405 to #r9467 
2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-18 15:09:19 +00:00
Meik Sievertsen
c3ef1109c0 Ticket #16945 
git-svn-id: file:///svn/phpbb/trunk@8288 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-12-27 16:27:24 +00:00
Jonathan Stanley
0ea0a361ae Possessed about possessives... and re-titlecasing an ACP title. Ho-ho-ho. 
git-svn-id: file:///svn/phpbb/trunk@6809 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-12-25 17:07:52 +00:00
Meik Sievertsen
fcc22ef2b0 show dropdown box for choosing the forum in user management screen -> permissions 
git-svn-id: file:///svn/phpbb/trunk@6808 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-12-25 15:19:45 +00:00
Jonathan Stanley
803f64c724 Bertiezilla make Bertie-smash on language files! 
#6244
#6278
#6284
#6286
#6336
#6340
#6342
#6344
#6346
#6352
#6358
#6364
#6376
#6382
#6386
#6388
#6418
#6420
#6426
#6428
#6430
#6434
#6452
#6454
#6458


git-svn-id: file:///svn/phpbb/trunk@6790 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-12-22 22:51:33 +00:00
Meik Sievertsen
564e6782f0 - #6110 
- #6102
- #6096


git-svn-id: file:///svn/phpbb/trunk@6738 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-12-10 15:09:31 +00:00
Meik Sievertsen
9cfa28b502 remove useless information from tz array 
git-svn-id: file:///svn/phpbb/trunk@6467 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-10-08 11:25:20 +00:00
Meik Sievertsen
cc4a0a2f7a consistent acp layout regarding backlinks and messages. 
git-svn-id: file:///svn/phpbb/trunk@6428 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-10-02 15:11:40 +00:00
Jonathan Stanley
6ac33db38d Righto... my first checkin for these language related thingies. Hopefully nothing 
has blown up! ;)

The basic style guide is:

1) British English, Cambridge style... ie: -ise, not -ize, etc.
2) Sentence-case pervasively with exception of acronyms/abbreviations, which if not in their contracted form, shall be in title-case. If you don't like it, you can
 restyle it via CSS using text-transform: none|uppercase|lowercase|capitalize; ...
 additional hooks may be added to the strings to assist this.
3) For those that have missed the switch to UTF-8, it means that the language files need not use numeric entities anymore. &lt;, &gt; and &amp; stay though, as
 they must always be entitised.

There'll be more tweaks and changes, though this "big 'un" is out of the way and will get progressively chilly so that it can be frozen for RC1 after
 however many betas there may be. ;) Wooh! :P


git-svn-id: file:///svn/phpbb/trunk@6399 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-09-24 00:28:32 +00:00
Nils Adermann
ea065f3e67 - no more encoding mixture, say hello to UTF-8 (I'll add a validation solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762] 
- take local server time into consideration for birthday/age calculation
- faster active topic search
- allow changing active topic time frame [Bug #4150]
- reload stylesheet on language change [Bug #4222]


git-svn-id: file:///svn/phpbb/trunk@6380 89ea8834-ac86-4346-8a33-228a782c2dd0
 2006-09-17 22:02:28 +00:00