Commit graph

9645 commits

Author SHA1 Message Date
Andreas Fischer
1778b53f12 Merge branch 'task/cs278/git-tools' into develop-olympus
* task/cs278/git-tools:
  [task/git-tools] Ignore git commit message comments
  [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
  [task/git-tools] Vastly expanded commit-msg hook.
  [task/git-tools] Beginnings of a syntax checking hook.
  [task/git-tools] Append ticket identifier to commit message prior to editing.
  [task/git-tools] add install and uninstall scripts for hooks
  [task/git-tools] move ticket id appending to commit-msg hook
  [task/git-tools] append ticket id to git log message
2010-08-10 15:50:53 +02:00
Chris Smith
e17ffa01e6 [task/git-tools] Ignore git commit message comments
Git commit message comments can be contained anywhere in the message and
this change ignores where they appear.

PHPBB3-9768
2010-08-10 14:48:46 +01:00
Chris Smith
a9046e5608 [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
PHPBB3-9768
2010-08-10 14:48:46 +01:00
Chris Smith
db13dc2d43 [task/git-tools] Vastly expanded commit-msg hook.
This updated hook supports validates each line of the commit message
confirms to the phpBB standards [1], there are two git config options
which adjust the behaviour of the hook. They are:

* phpbb.hooks.commit-msg.fatal: Set to false for the hook to allow
	commits with malformed structure, useful if you'll be squashing
	or editing the commits later. True is the default value.
* phpbb.hooks.commit-msg.debug: Any integer value greater than 0 will
	increase the debugging verbosity of the hook, the default value is 0.

[1] http://wiki.phpbb.com/display/DEV/Git

PHPBB3-9768
2010-08-10 14:48:46 +01:00
Chris Smith
66e58234ec [task/git-tools] Beginnings of a syntax checking hook.
Currently this hook checks line length is less than or equal to 80 characters.

PHPBB3-9768
2010-08-10 14:48:45 +01:00
Chris Smith
bfa7b28734 [task/git-tools] Append ticket identifier to commit message prior to editing.
PHPBB3-9770
2010-08-10 14:48:40 +01:00
Andreas Fischer
e1328e87ce Merge branch 'ticket/jellydoughnut/9757' into develop-olympus
* ticket/jellydoughnut/9757:
  [ticket/9757] Fix empty template variable {HISTORY_TITLE}
2010-07-31 02:11:33 +02:00
Andreas Fischer
f179987f64 Merge branch 'ticket/jellydoughnut/9499' into develop-olympus
* ticket/jellydoughnut/9499:
  [ticket/9499] Unify definition of dE() and other javascript functions
2010-07-31 02:10:00 +02:00
Andreas Fischer
ccb4182d29 Merge branch 'ticket/kellanved/9521' into develop-olympus
* ticket/kellanved/9521:
  [ticket/9521] Fix error reporting for the native SQL Server plugin.
2010-07-31 02:08:40 +02:00
Andreas Fischer
4d61788843 Merge branch 'ticket/jellydoughnut/9679' into develop-olympus
* ticket/jellydoughnut/9679:
  [ticket/9679] phpBB offers to notify poster even if notification is disabled
2010-07-31 02:07:25 +02:00
Andreas Fischer
d0d9122165 Merge branch 'ticket/jellydoughnut/9722' into develop-olympus
* ticket/jellydoughnut/9722:
  [ticket/9722] Adjust "New Topic" title attribute for consistency in prosilver
2010-07-31 02:06:44 +02:00
Andreas Fischer
4de440826d Merge branch 'ticket/jellydoughnut/9749' into develop-olympus
* ticket/jellydoughnut/9749:
  [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
2010-07-31 02:06:12 +02:00
Andreas Fischer
c8bb9a2d37 Merge branch 'ticket/jellydoughnut/9559' into develop-olympus
* ticket/jellydoughnut/9559:
  [ticket/9559] Do not override queue package size in the case of an overflow
2010-07-31 02:04:54 +02:00
Henry Sudhof
47557fd4d2 [ticket/9521] Fix error reporting for the native SQL Server plugin.
The native SQL Server plugin used to return an error string when calling
sql_error. However, some error condition checks are done using is_array.
This patch wraps the error into an array to follow the error logic used
elsewhere.

PHPBB3-9521
2010-07-31 01:48:13 +02:00
Josh Woody
15d7010d46 [ticket/9757] Fix empty template variable {HISTORY_TITLE}
The template variable {HISTORY_TITLE} was always being set to the empty string.
It is now filled with the title of the currently displayed message.  It is not
showed in prosilver or subsilver2 for aesthetic reasons (title is already
prominent)

PHPBB3-9757
2010-07-29 13:19:19 -05:00
Josh Woody
ac56b71c3e [ticket/9749] Fulltext mysql unexpected behavior on entering a dash in query
The Fulltext_mysql class had different behavior when a dash was entered in the
search query than the fulltext_native class.  Specifically, a dash was
automatically turned into boolean NOT even when the user wanted to search for
legitimate hyphenated words like farty-pants

PHPBB3-9749
2010-07-29 10:13:17 -05:00
Josh Woody
8ea0309ed1 [ticket/9679] phpBB offers to notify poster even if notification is disabled
The "notify user" check box would not do anything if checked in this case, but
it was still presented.  The checkbox is now only shown if there are
notification options enabled.

PHPBB3-9679
2010-07-29 10:01:35 -05:00
Andreas Fischer
18079d01b3 Merge branch 'task/evil3/set-permissions' into develop-olympus
* task/evil3/set-permissions:
  [task/set-permissions] shell script to set file permissions
2010-07-29 14:57:53 +02:00
Josh Woody
4880305436 [ticket/9499] Unify definition of dE() and other javascript functions
dE() was defined differently in the ACP and in prosilver.  Other javascript
in editor.js files has also been unified (taking the prosilver implementation
as cannonical)

PHPBB3-9499
2010-07-26 13:29:53 -05:00
Josh Woody
2f312b2175 [ticket/9559] Do not override queue package size in the case of an overflow
This reverts r8025 to includes/functions_messenger.php.  That code caused
problems on hosters with email limits less than package_size*2.5.  And it isn't
desirable in general to over-ride the admin's configuration options.

PHPBB3-9559
2010-07-22 10:44:31 -05:00
Josh Woody
c284ffade9 [ticket/9722] Adjust "New Topic" title attribute for consistency in prosilver
Title attribute was being applied to a <div> at the top of the page and to an
<a> at the bottom of the page.  Now both being applied to the <div>.

PHPBB3-9722
2010-07-21 22:42:44 -05:00
Andreas Fischer
fc25fe694a Merge branch 'ticket/bantu/9068' into develop-olympus
* ticket/bantu/9068:
  [ticket/9068] Added a missing comma in acp load settings explanation text.
2010-07-22 01:41:02 +02:00
Andreas Fischer
0f5814ac4f Merge branch 'ticket/bantu/9744' into develop-olympus
* ticket/bantu/9744:
  [ticket/9744] Fix mistyped word 'then' in FAQ. It should be 'than'.
2010-07-22 01:40:44 +02:00
Andreas Fischer
fada2ad261 Merge branch 'ticket/t-backoff/9099' into develop-olympus
* ticket/t-backoff/9099:
  [ticket/9099] Add missing commas in acp language.
2010-07-22 01:40:19 +02:00
Andreas Fischer
cfe0b5356f Merge branch 'ticket/jellydoughnut/9727' into develop-olympus
* ticket/jellydoughnut/9727:
  [ticket/9727] Smiley Path replacement in feeds is too generic
2010-07-22 01:39:18 +02:00
Nick Anderegg
afff4f7923 [ticket/9068] Added a missing comma in acp load settings explanation text.
PHPBB3-9068
2010-07-22 01:36:08 +02:00
Andreas Fischer
72dddf3aa3 [ticket/9744] Fix mistyped word 'then' in FAQ. It should be 'than'.
PHPBB3-9744
2010-07-22 00:31:13 +02:00
Tabitha Backoff
875fcda506 [ticket/9099] Add missing commas in acp language.
PHPBB3-9099
2010-07-21 17:37:14 +02:00
Josh Woody
16c95b4f83 [ticket/9727] Smiley Path replacement in feeds is too generic
The smiley path replacement in the feeds was too broad: any post content
containing "./" was changed to the fully qualified board URL. This broke CSS
for example.

PHPBB3-9727
2010-07-18 11:51:13 -05:00
Andreas Fischer
0dc05a2d84 Merge branch 'ticket/kellanved/9504' into develop-olympus
* ticket/kellanved/9504:
  [ticket/9504] Allow whitespaces in gallery avatars
2010-07-15 23:15:41 +02:00
Andreas Fischer
cb043b0e61 Merge branch 'ticket/rxu/9658' into develop-olympus
* ticket/rxu/9658:
  [ticket/9658] Optimize topic splitting.
2010-07-15 23:15:36 +02:00
rxu
1363ee109b [ticket/9658] Optimize topic splitting.
Split topics takes too long in some cases because of wrong variables or arrays
values types adjustment. Cast values representing topic and forum ids as int.

PHPBB3-9658
2010-07-15 23:10:22 +02:00
Henry Sudhof
8690d25b4f [ticket/9504] Allow whitespaces in gallery avatars
Gallery avatars are discovered on the server filesystem; to allow linking to
the images, the filenames are urlencoded before being written to the database.
However, getimagesize needs the decoded filename as input.

PHPBB3-9504
2010-07-15 13:05:56 +02:00
Andreas Fischer
e7e98f1de5 Merge branch 'ticket/nickvergessen/7720' into develop-olympus
* ticket/nickvergessen/7720:
  [ticket/7720] Fix alternative image-description for unread posts.
2010-07-14 20:55:49 +02:00
Joas Schilling
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
Igor Wiedler
14e5da90c3 [task/git-tools] add install and uninstall scripts for hooks
PHPBB3-9769
2010-07-12 02:04:29 +01:00
Igor Wiedler
6b2f4b6a85 [task/git-tools] move ticket id appending to commit-msg hook
PHPBB3-9770
2010-07-12 02:04:29 +01:00
Igor Wiedler
f0509e4620 [task/git-tools] append ticket id to git log message
PHPBB3-9770
2010-07-12 02:04:29 +01:00
Andreas Fischer
da256b33d9 Merge branch 'ticket/ckwalsh/9715' into develop-olympus
* ticket/ckwalsh/9715:
  [ticket/9715] Better email regex
  [ticket/9715] Extend email unit tests
2010-07-12 01:56:00 +02:00
Andreas Fischer
d869fc9804 Merge branch 'ticket/bantu/9714' into develop-olympus
* ticket/bantu/9714:
  [ticket/9714] Use correct variable name in email regular expression tests.
2010-07-12 01:55:52 +02:00
Andreas Fischer
88f6caf012 Merge branch 'ticket/naderman/9701' into develop-olympus
* ticket/naderman/9701:
  [ticket/9701] Prevent notices from being hidden by template tests
2010-07-12 01:53:58 +02:00
Andreas Fischer
eb7254a0c4 Merge branch 'ticket/naderman/9140' into develop-olympus
* ticket/naderman/9140:
  [ticket/9140] Check current board version in incremental update packages
2010-07-12 01:38:39 +02:00
Gabriel Vazquez
2ba6360e43 [ticket/9140] Check current board version in incremental update packages
Since we do not want to limit the updater functionality we only display
a prominent warning when the current board version does not match the
version the update files are meant to update from.

PHPBB3-9140
2010-07-12 01:37:05 +02:00
Cullen Walsh
593e193bdc [ticket/9715] Better email regex
Using email regex created by James Watts and Francisco Jose Martin Moreno.
This passes many more tests for RFC valid emails.

PHPBB3-9715
2010-07-11 16:22:26 -07:00
Cullen Walsh
a0b9f7806a [ticket/9715] Extend email unit tests
Adding more email tests for a wider range of valid email formats.

PHPBB3-9715
2010-07-11 16:20:27 -07:00
Andreas Fischer
6724b79967 Merge branch 'ticket/nickvergessen/9531' into develop-olympus
* ticket/nickvergessen/9531:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
2010-07-12 00:04:33 +02:00
Joas Schilling
5d9948e39c [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables.

PHPBB3-9531
2010-07-11 10:18:45 +02:00
Andreas Fischer
062d8fda04 Merge branch 'ticket/adamreyher/9012' into develop-olympus
* ticket/adamreyher/9012:
  [ticket/9012] Adjust shadow topic title to the title at the time it was moved.
2010-07-11 02:53:06 +02:00
Adam Reyher
b939ce5940 [ticket/9012] Adjust shadow topic title to the title at the time it was moved.
Moved topics which have their title changed in the new forum will now show the
old title in the original viewforum instead of the new title.

PHPBB3-9012
2010-07-11 02:44:07 +02:00
Andreas Fischer
2d9aa45aef Merge branch 'ticket/jellydoughnut/9637' into develop-olympus
* ticket/jellydoughnut/9637:
  [ticket/9637] Do not cache SQL server version in all cases
2010-07-11 01:44:59 +02:00