Commit graph

10007 commits

Author SHA1 Message Date
Andreas Fischer
6cb574d03c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9587] Replace '0px' with '0'.
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 18:37:53 +02:00
Andreas Fischer
26057fe3ff Merge branch 'ticket/bantu/9587' into develop-olympus
* ticket/bantu/9587:
  [ticket/9587] Replace '0px' with '0'.
2010-06-17 18:35:53 +02:00
Andreas Fischer
4bc2158235 [ticket/9587] Replace '0px' with '0'.
This has been introduced by merge of c7a25c58b8, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead.

PHPBB3-9587
2010-06-17 17:01:13 +02:00
Andreas Fischer
f9105084b0 Merge branch 'ticket/nickvergessen/9605' into develop-olympus
* ticket/nickvergessen/9605:
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:47:48 +02:00
Andreas Fischer
478f8052ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [feature/dbal-tests] Follow the coding guidelines and ...
  [feature/dbal-tests] Update data
  [feature/dbal-tests] Multi insert
  [feature/dbal-tests] Delete data
  [feature/dbal-tests] Insert data
  [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
  [ticket/9587] Prosilver overrides reCaptcha class.
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:33:48 +02:00
Andreas Fischer
9975d24b9d Merge branch 'ticket/nickvergessen/9605' into develop-olympus
* ticket/nickvergessen/9605:
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:31:38 +02:00
Andreas Fischer
84e58260ae Merge branch 'ticket/nickvergessen/9587' into develop-olympus
* ticket/nickvergessen/9587:
  [ticket/9587] Prosilver overrides reCaptcha class.
2010-06-17 16:27:25 +02:00
Andreas Fischer
8d18b98e15 Merge branch 'feature/bantu/dbal-tests' into develop-olympus
* feature/bantu/dbal-tests:
  [feature/dbal-tests] Follow the coding guidelines and ...
  [feature/dbal-tests] Update data
  [feature/dbal-tests] Multi insert
  [feature/dbal-tests] Delete data
  [feature/dbal-tests] Insert data
  [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
2010-06-17 16:17:06 +02:00
Joas Schilling
ef69f22698 [feature/dbal-tests] Follow the coding guidelines and ...
resolved a bug caused by a missing order-by.

PHPBB3-9625
2010-06-17 16:06:17 +02:00
Joas Schilling
e3420de295 [feature/dbal-tests] Update data
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
d9c2e6cbcf [feature/dbal-tests] Multi insert
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
c4b0814c62 [feature/dbal-tests] Delete data
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
539ae0ffaf [feature/dbal-tests] Insert data
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
b03a7a2c83 [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
PHPBB3-9625
2010-06-17 16:06:10 +02:00
Joas Schilling
82db1c9c50 [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
Compare the topic_type on their real value, to ensure there is no MOD causing problems, because of a new topic-type.

PHPBB3-9605
2010-06-17 15:56:25 +02:00
Andreas Fischer
fe690779d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9623] Proper UTF8 encoding for usernames in pruning section
  [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"
  [ticket/9179] Remove unnecessary newline.
  [ticket/9147] "Change topic type"-option "Normal" always selected.
2010-06-15 15:02:16 +02:00
Andreas Fischer
6c7d16894b Merge branch 'ticket/jellydoughnut/9633' into develop-olympus 2010-06-15 14:28:00 +02:00
Andreas Fischer
7c789795fb Merge branch 'ticket/jellydoughnut/9623' into develop-olympus 2010-06-15 13:41:02 +02:00
Josh Woody
d6551b1233 [ticket/9623] Proper UTF8 encoding for usernames in pruning section
The username textboxes were not being properly encoded in UTF8.

PHPBB3-9623
2010-06-15 13:39:58 +02:00
Josh Woody
b4df815547 [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"
Due to an oversight, the default group was not properly checked in the user_add function.  This fix corrects the check.  No other changes are needed because they go direct to the database, this one used an array in memory.

PHPBB3-9633
2010-06-01 00:19:43 -05:00
Nils Adermann
a5b238019b Merge branch 'feature/notify_status' into develop-olympus
* feature/notify_status:
  [ticket/9179] Remove unnecessary newline.
2010-05-30 15:20:37 +02:00
Andreas Fischer
491fc0516e [ticket/9179] Remove unnecessary newline.
cc8d22bed6 added one empty line too much.

PHPBB3-9179
2010-05-30 15:20:15 +02:00
Nils Adermann
c38cb1761c Merge branch 'ticket/nickvergessen/9147' into develop-olympus
* ticket/nickvergessen/9147:
  [ticket/9147] "Change topic type"-option "Normal" always selected.
2010-05-30 15:05:06 +02:00
Nils Adermann
2cf57822bb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
  [ticket/9135] Fix report-icon for moderators in PM folders.
  [ticket/8936] Subsilver2 missing reply-to-all feature.
  [ticket/7782] Return 404 HTTP status code for nonexistent attachments.
  [ticket/7782] Added spaces.
  [ticket/7782] Added phpdoc comment for send_status_line function.
  [ticket/7782] Send status line using refactored download/file.php logic.
  [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
2010-05-30 14:59:06 +02:00
Nils Adermann
8f91e6ce8b Merge branch 'ticket/nickvergessen/9135' into develop-olympus
* ticket/nickvergessen/9135:
  [ticket/9135] Fix report-icon for moderators in PM folders.
2010-05-30 14:58:30 +02:00
Nils Adermann
a6b07eef5a Merge branch 'ticket/nickvergessen/9094' into develop-olympus
* ticket/nickvergessen/9094:
  [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
2010-05-30 14:54:22 +02:00
Nils Adermann
760957e7e7 Merge branch 'ticket/nickvergessen/8936' into develop-olympus
* ticket/nickvergessen/8936:
  [ticket/8936] Subsilver2 missing reply-to-all feature.
2010-05-30 14:26:17 +02:00
Nils Adermann
b7afeadd6d Merge branch 'ticket/bantu/8792' into develop-olympus
* ticket/bantu/8792:
  [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
2010-05-30 14:19:58 +02:00
Nils Adermann
26c2efc083 Merge branch 'ticket/p/7782' into develop-olympus
* ticket/p/7782:
  [ticket/7782] Return 404 HTTP status code for nonexistent attachments.
  [ticket/7782] Added spaces.
  [ticket/7782] Added phpdoc comment for send_status_line function.
  [ticket/7782] Send status line using refactored download/file.php logic.
2010-05-29 23:23:08 +02:00
Joas Schilling
801a44b3f0 [ticket/9147] "Change topic type"-option "Normal" always selected.
PHPBB3-9147
2010-05-28 14:25:56 +02:00
Joas Schilling
4746a60d22 [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
When creating a forum, you afterwards read "Forum created successfully. Now you are able to set permissions for this forum.", also when you already copied the permissions from another forum.

PHPBB3-9094
2010-05-27 15:17:03 +02:00
Joas Schilling
9e24993855 [ticket/9135] Fix report-icon for moderators in PM folders.
There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users.

PHPBB3-9135
2010-05-26 01:38:19 +02:00
Joas Schilling
c7a25c58b8 [ticket/9587] Prosilver overrides reCaptcha class.
PHPBB3-9587
2010-05-24 23:59:28 +02:00
Joas Schilling
b6df5bdb14 [ticket/8936] Subsilver2 missing reply-to-all feature.
PHPBB3-8936
2010-05-24 23:32:18 +02:00
Joas Schilling
877d852a52 [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
Just added a check whether the type is announcement or higher.

PHPBB3-9605
2010-05-24 20:12:34 +02:00
Oleg Pudeyev
c185e45e09 [ticket/7782] Return 404 HTTP status code for nonexistent attachments.
PHPBB3-7782
2010-05-17 14:14:53 -04:00
Oleg Pudeyev
d721e94b88 [ticket/7782] Added spaces.
PHPBB3-7782
2010-05-17 02:01:13 -04:00
Oleg Pudeyev
691f682fc2 [ticket/7782] Added phpdoc comment for send_status_line function.
PHPBB3-7782
2010-05-16 19:52:01 -04:00
Oleg Pudeyev
c1a4cb1d01 [ticket/7782] Send status line using refactored download/file.php logic.
PHPBB3-7782
2010-05-16 18:24:26 -04:00
Andreas Fischer
327f9afbc0 [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
No longer use LDAP_NO_SERVER_CONNECTION in case ldap_search() fails.
Add and use LDAP_SEARCH_FAILED instead, so users can tell the difference
between ldap_connect() failing and ldap_search() failing.

PHPBB3-8792
2010-05-16 23:05:13 +02:00
Nils Adermann
904d2049c8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Move rxu and nickvergessen to Developers
2010-05-16 20:46:12 +02:00
Joas Schilling
6d7e30ae99 [develop-olympus] Move rxu and nickvergessen to Developers 2010-05-16 20:06:11 +02:00
Nils Adermann
591217a903 Merge branch 'develop-olympus' into develop
* develop-olympus: (21 commits)
  [feature/notify_status] Define'd constants for notify_status
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
  [ticket/9547] Use separate constants for display/enable active topics.
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9545] Initial forum should display active topics by default.
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
  [ticket/9529] Topic review is not showing all selected posts.
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
  [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
  [ticket/9119] Respect language selection on automated update.
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
  [ticket/9567] Newly registered users group description rewording.
  ...
2010-05-16 19:52:36 +02:00
Nils Adermann
0bf2c3eed5 Merge branch 'feature/notify_status' into develop-olympus
* feature/notify_status:
  [feature/notify_status] Define'd constants for notify_status
2010-05-16 19:51:25 +02:00
Mark
cc8d22bed6 [feature/notify_status] Define'd constants for notify_status
define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in
forums_watch table and topics_watch table

PHPBB3-9179
2010-05-16 19:50:35 +02:00
Nils Adermann
e36da18b1c Merge branch 'ticket/p/7782' into develop-olympus
* ticket/p/7782:
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
2010-05-16 19:25:41 +02:00
Oleg Pudeyev
82ce29ac58 [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
PHPBB3-7782
2010-05-16 19:23:54 +02:00
Nils Adermann
321f7a9946 Merge branch 'ticket/nickvergessen/9530' into develop-olympus
* ticket/nickvergessen/9530:
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
2010-05-16 19:17:25 +02:00
Joas Schilling
a11fa9c738 [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
PHPBB3-9530
2010-05-16 19:14:57 +02:00
Joas Schilling
d147bdcd73 [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
PHPBB3-9530
2010-05-16 19:14:36 +02:00