1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00
Commit Graph

753 Commits

Author SHA1 Message Date
19d76f76dc [feature/postgresql-fulltext-search] remove phrase search code
Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.

PHPBB3-9730
2012-07-05 21:17:23 +05:30
7294c71431 [ticket/10778] Remove extra space from close link in prosilver smilies window
PHPBB3-10778
2012-05-01 14:41:02 -03:00
7fc4a184c2 Merge PR #592 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
2012-04-19 21:03:15 -04:00
6e77ca7c99 Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympus
* nickvergessen/ticket/9089:
  [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
  [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
2012-04-19 21:02:48 -04:00
de7a166a59 Merge remote-tracking branch 'callumacrae/ticket/10783' into develop
* callumacrae/ticket/10783:
  [ticket/10783] Fixed an HTML error with assets_version.
2012-04-13 13:35:37 +02:00
875958573c [ticket/10783] Fixed an HTML error with assets_version.
PHPBB3-10783
2012-04-13 12:10:49 +01:00
790cc0c54f Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop
* github-callumacrae/ticket/10783:
  [ticket/10783] Added assets_version to ACP and simple_*.html.
  [ticket/10783] Added assets_version to subsilver2.
  [ticket/10783] Added ?assets_version to assets.
2012-04-13 03:32:01 +02:00
6ad58c7e04 [ticket/10783] Added assets_version to ACP and simple_*.html.
PHPBB3-10783
2012-04-11 14:37:15 +01:00
5665e82616 [ticket/10783] Added ?assets_version to assets.
PHPBB3-10783
2012-04-11 14:30:11 +01:00
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
ce4eb62b14 Merge PR #716 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
2012-04-07 22:33:53 -04:00
3ec941937a Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympus
* callumacrae/ticket/10455:
  [ticket/10455] Removed NOTE from prosilver overall_header.html.
2012-04-07 22:32:14 -04:00
be9eb57785 [ticket/10455] Removed NOTE from prosilver overall_header.html.
PHPBB3-10455
2012-04-05 22:22:11 +01:00
98964a913c [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly.

In particular, display_last_subject per-forum option needs consensus.

This reverts commit b1fb34a4d7, reversing
changes made to 7d6b289671.

PHPBB3-10650
2012-04-04 19:23:05 -04:00
b1fb34a4d7 Merge remote-tracking branch 'rahulr92/ticket/10650' into develop 2012-04-04 16:41:28 -04:00
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
663b5f6542 [ticket/10650] Cropped subject and inserted newline
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.

PHPBB3-10650
2012-04-05 00:46:14 +05:30
01e6254ccc [ticket/10650] Changed language files and forumlist
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.

PHPBB3-10650
2012-04-05 00:45:50 +05:30
f32547c215 [ticket/10650] Displaying last topic on forum list
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.

PHPBB3-10650
2012-04-05 00:45:26 +05:30
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
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
51bc9540cf Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus
* sadu/ticket/10699:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
2012-04-02 16:18:56 +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
03f5fde747 [ticket/10734] Removed unwanted span classes
Removed the corner and clear span classes

PHPBB-10734
2012-04-02 00:42:11 +05:30
rxu
bf0a3ddaca Merge pull request #670 from imkingdavid/feature/qrpreview
[feature/qrpreview] Preview from Quick Reply
2012-04-01 11:28:47 -07:00
b548389207 Merge remote-tracking branch 'upstream/develop' into ticket/10665
* upstream/develop:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10731] Fixed addquote() to work on opera browser.
  [ticket/10731] Fixed addquote() to work on opera browser.
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
  [ticket/10675] Add disk full language string when posting attachments
2012-04-01 19:28:37 +03:00
b1b530f92c [ticket/10731] Fixed addquote() to work on opera browser.
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
2012-04-01 17:05:31 +03:00
e7cf4bfb2e [ticket/10731] Fixed addquote() to work on opera browser.
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
2012-04-01 18:25:50 +05:30
2225efc560 [ticket/10665] INCLUDEJS template changes
Implementing INLCUDEJS template tag in styles

PHPBB3-10665
2012-04-01 10:58:59 +03:00
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04:00
259b86199b [ticket/10734] Fixed template files
Removed unnecessary span from several other template files

PHPBB3-10734
2012-03-31 22:30:00 +05:30
609e8e3b11 [ticket/10734] Fixed template files
Removed unnecessary span from overall_header, overall_footer,
forumlist_body, viewforum_body.

PHPBB3-10734
2012-03-31 22:30:00 +05:30
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
0c8d0a82de [feature/qrpreview] Add id qr_postform to prosilver QR
PHPBB3-10726
2012-03-30 21:46:20 -04:00
a7045e6572 [feature/qrpreview] Preview from Quick Reply
PHPBB3-10726
2012-03-30 21:43:00 -04:00
b42e10df28 [feature/ajax] Remove strange non-breaking spaces from approve button
The viewtopic inline approve/disapprove buttons for posts had spaces.

PHPBB3-10270
2012-03-31 02:10:18 +02:00
ac320fad05 [ticket/10270] Alter background colors for posts
Change background colors for posts after deleted post

PHPBB3-10270
2012-03-31 02:10:17 +02:00
07826d6679 [feature/ajax] Remove quick-reply AJAX handling until we have something good
The current implementation is not very user friendly, lots of things flashing
in the user's face. We can re-consider AJAX when we have a decent solution.

PHPBB3-10270
2012-03-31 02:10:17 +02:00
6145e0ba65 [ticket/10270] Changing close button for ajax popups
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css

PHPBB3-10270
2012-03-31 02:10:16 +02:00
cf92528390 [ticket/10270] Disabling links in disappearing content
Disabling click events for blocks that are being removed via ajax

PHPBB3-10270
2012-03-31 02:10:16 +02:00
10055d58cd [ticket/10291] Fixed an AJAX bug on quick reply form submit.
It wasn't fading out.

PHPBB3-10291
2012-03-31 02:10:16 +02:00
d8e21952fa [ticket/10273] Fixed accepting / denying posts AJAX.
PHPBB3-10273
2012-03-31 02:10:16 +02:00
2f44850a28 [feature/ajax] Fix filter check, quick mod tools data-attribute
PHPBB3-10270
2012-03-31 02:10:14 +02:00
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box
PHPBB3-10270
2012-03-31 02:09:26 +02:00
2f25173d93 [feature/ajax] Change filter semantics, some minor adjustments
PHPBB3-10270
2012-03-31 02:09:26 +02:00
de82608e6f [feature/ajax] Refactor phpbb.ajaxify event callback
PHPBB3-10270
2012-03-31 02:09:26 +02:00
b8a6a50f5c [feature/ajax] Rename exception to filter
PHPBB3-10270
2012-03-31 02:09:25 +02:00