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

66 Commits

Author SHA1 Message Date
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
0540509f14 [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
Changing from "delete" to "uninstall" in acp_styles to avoid confusing users

PHPBB3-10632
2012-03-31 17:58:17 +03:00
398a6c8045 Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
2012-03-31 10:43:06 +03:00
1cb3b595ec [ticket/10271] AJAXified the styles tab in the ACP.
PHPBB3-10271
2012-03-31 02:09:15 +02:00
506951e8af [feature/merging-style-components] Changing acp_styles text
Changing acp styles welcome message a little bit.

PHPBB3-10632
2012-03-30 16:13:16 +03:00
0c6955e73c [feature/merging-style-components] Adding new language variables
Adding new language variables for acp_styles and removing some unused variables

PHPBB3-10632
2012-03-14 23:45:54 +02:00
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
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
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
8b21983222 [feature/remove-db-styles] Update language to reflect removal of db storage.
PHPBB3-9741
2011-09-20 22:42:52 +01:00
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable.
PHPBB3-9741
2011-09-20 22:18:06 +01:00
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
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
540545c4bd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
2011-06-18 15:12:52 +02:00
dd0606a317 [ticket/10229] On languge/acp/styles.php "%s" should be %s
PHPBB3-10229
2011-06-18 15:00:39 +02:00
0e02f5cb0b [ticket/9675] Put the code into methods to avoid code duplication.
PHPBB3-9675
2011-02-08 14:57:42 +01:00
18fedfce17 [ticket/9675] Adjust the language-string to reflect the changes.
PHPBB3-9675
2011-02-08 14:57:29 +01:00
ffcd307746 [ticket/9675] Add option to delete template/theme/imageset when deleting style.
PHPBB3-9675
2011-02-08 14:27:27 +01:00
59e62d271c [ticket/9822] Correct some style related ACP explain statements.
Remove "Additionally, if you have permission you can elect to remove the set
from the filesystem." because that functionality is not implemented.

Also remove unnecessary "When the imageset is deleted it is gone for good."
statement, "It is recommended that you first export your set for possible
future use." should be clear enough.

PHPBB3-9822
2010-10-15 17:57:43 +02:00
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts.
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.

PHPBB3-7720
2010-07-14 20:55:07 +02:00
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
7ded9151f7 two tiny glitches in language file
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9046 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-02 16:19:11 +00:00
eda1d40861 Okay. Frozen, we never said anything about it being permafrost. Also, this is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8697 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-28 14:24:37 +00:00
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
c9940c581e forgot that file in my last commit
git-svn-id: file:///svn/phpbb/trunk@7898 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-16 23:06:42 +00:00
0d074672fa Introducing the ability to manually set the dimensions of an image in the imageset editor.
A little spelling.

Introduces new language variable(s).

#11925
#11675


git-svn-id: file:///svn/phpbb/trunk@7750 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-11 12:39:51 +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
60000cec97 Some fixes...
@translators: please note the split of SEND_EMAIL ;)


git-svn-id: file:///svn/phpbb/trunk@7672 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-24 16:18:04 +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
00da476aa7 #11042
git-svn-id: file:///svn/phpbb/trunk@7609 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-16 16:55:22 +00:00
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
66d5070564 Theme editor replaced with something more basic, it was not robust and was more error prone
git-svn-id: file:///svn/phpbb/trunk@7562 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-13 20:35:34 +00:00
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
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
887863e5c5 - overhaul of imagesets
imagesets are now "intelligently" multilingual, one may use imagesets inside of CSS files now (as well as properties like the width and height of an imageset's image)
all previous styles should change their imageset.cfg to be like prosilver and subsilver2 (notice how there is now an imageset.cfg in the /en folder, there should be one for each language)


git-svn-id: file:///svn/phpbb/trunk@7304 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-08 17:40:36 +00:00
a43416dbb2 - acp popup, shouldn't require 700 px width
- throw an error if an image that's edited into an imageset doesn't exist
- convert the password not its hash ;-)
- only update user_login_attempts if necessary
- make password requirements even clearer


git-svn-id: file:///svn/phpbb/trunk@7250 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-31 16:44:18 +00:00
2e941d3d38 trying to fix some bugs...
git-svn-id: file:///svn/phpbb/trunk@7054 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-02-24 12:31:21 +00:00
5bb75c590d - allow underscores in CSS class names / ids
- remove control characters from clean strings, and map all space characters to ASCII space (\x20)


git-svn-id: file:///svn/phpbb/trunk@6932 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-26 18:15:17 +00:00
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
e3c854288c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:44 -05:00
efedc973eb [ticket/6109] MSN is now called Windows Live Messenger (WLM)
Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
2011-01-10 01:44:54 +01: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
0af60d92cc Farewell Asterix the Gaul. :P
#6616


git-svn-id: file:///svn/phpbb/trunk@6820 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-28 18:28:09 +00:00
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
f40e2aba22 - finally correctly calculate current time for birthday calculation [Bug #6030]
- allow searching forums with unsearchable subforums [Bug #6056]
- addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans
- do not index forums which have indexing disabled on index recreation [Bug #6060]
- properly handle html entities in the theme editor [Bug #6048]
- anonymous access is no longer required for the LDAP auth plugin [Bug #6046]
- corrected mcp_front queue link to point to approve_details [Bug #6134]
- added direct (dis)approval to mcp_front queue items [Bug #6134]
- proper mysql version test for fulltext-compatibility [Bug #6054]
- added note to style/language "used by" column so it's clear that bots are included
- correctly update bot last visit time [Bug #6108]


git-svn-id: file:///svn/phpbb/trunk@6740 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-10 17:44:45 +00:00
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
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
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. <, > and & 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
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
83e6dcb1ce - removed a useless line [Bug #3656]
- do not reuse session ids [Bug #3626]
- Bug #3684
- added refresh imageset option


git-svn-id: file:///svn/phpbb/trunk@6257 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-10 13:33:06 +00:00