Commit graph

2384 commits

Author SHA1 Message Date
Joas Schilling
bbada27ee9 [ticket/12115] Also port user interests to profile fields
PHPBB3-12115
2014-02-06 11:32:11 +01:00
Joas Schilling
38608bfa62 [ticket/12115] Remove occupation field from html files
PHPBB3-12115
2014-02-06 11:32:07 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Andreas Fischer
bc98118f92 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12146] Added a missing # to inline css-style of <span>

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html
2014-02-02 17:20:07 +01:00
Crizz0
88fad5856a [ticket/12146] Added a missing # to inline css-style of <span>
PHPBB3-12146
2014-02-02 16:44:52 +01:00
Nils Adermann
38af79dd30 Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
2014-02-02 16:34:55 +01:00
Joas Schilling
cbad102f88 [ticket/11201] Split template file into multiple files
PHPBB3-11201
2014-02-02 16:20:02 +01:00
Andreas Fischer
c25d4e8e43 Merge pull request #1959 from prototech/ticket/12131
[ticket/12131] Remove invalid imageset var in viewtopic print view.

* prototech/ticket/12131:
  [ticket/12131] Remove invalid imageset var in viewtopic print view.
2014-02-02 12:58:11 +01:00
Andreas Fischer
5553f33f3d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12119] Remove meta tags from view-print templates

Conflicts:
	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html
2014-01-27 20:48:28 +01:00
Marcus Vinicius
a32db45166 [ticket/12119] Remove meta tags from view-print templates
PHPBB3-12119
2014-01-27 16:42:39 -03:00
Cesar G
f6d338fd8b [ticket/12137] Fix spacing in smiley block.
PHPBB3-12137
2014-01-26 18:11:16 -08:00
Andreas Fischer
9b500538e3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
2014-01-26 20:51:55 +01:00
Cesar G
525f1be319 [ticket/12131] Remove invalid imageset var in viewtopic print view.
PHPBB3-12131
2014-01-26 01:03:49 -08:00
Marcus Vinicius
cb7a0d6f2a [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
PHPBB3-12118
2014-01-26 03:19:43 -03:00
Cesar G
8620f1e619 [ticket/12125] Specify nth-child selectors separately - IE8 does not like them
PHPBB3-12125
2014-01-24 04:30:14 -08:00
Nathan Guse
5b452ffe27 [ticket/11950] Fix prior commit
PHPBB3-11950
2014-01-22 10:43:29 -06:00
Suhaib Khan
88bd88b612 Adding 'forgot password' link to index page
PHPBB3-11950

Signed-off-by: Suhaib Khan <suhebjerk@gmail.com>
2014-01-22 12:42:33 +05:30
Joas Schilling
0ce98d7eac [ticket/11201] Allow translation of profile field name and explanation
PHPBB3-11201
2014-01-19 14:52:51 +01:00
Nathan Guse
ab41396707 Merge pull request #1866 from prototech/ticket/11915
[ticket/11915] Improve Plupload integration
2014-01-17 19:28:31 -08:00
Cesar G
ebc2d1dd1b [ticket/11915] Pass the data to the template instead of scraping HTML for it.
PHPBB3-11915
2014-01-17 19:25:12 -08:00
Cesar G
9a21dec1b6 [ticket/11915] Replace inline onclick event for inserting attachment bbcodes.
PHPBB3-11915
2014-01-17 19:25:11 -08:00
Cesar G
702efc8496 [ticket/11915] Remove files that are no longer used.
PHPBB3-11915
2014-01-17 19:25:11 -08:00
Cesar G
628323a80a [ticket/11915] Remove unused language string.
PHPBB3-11915
2014-01-17 19:20:37 -08:00
Cesar G
020b7a31bf [ticket/11915] Make the user aware of the drag-and-drop zone.
PHPBB3-11915
2014-01-17 19:20:37 -08:00
Cesar G
f858ec1f56 [ticket/11915] Fix various problems with responsive design.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
9c1cacae42 [ticket/11915] Provide the URL to the attachment when it's uploaded.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
708622a0bb [ticket/11915] Do not display the "Place inline" button when JS is disabled.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
1272c9272e [ticket/11915] Remove unnecessary JS file and include others using INCLUDEJS.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
688ca7fade [ticket/11915] Add the new uploader.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
2719a18f7f [ticket/11915] Make it possible to display trigger_error() messages to user.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
0ea110292b [ticket/11915] Provide some additional info about limits to the uploader.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
691dfd8453 [ticket/11915] Add row template for new attachments.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
4361c1c9ac [ticket/11915] Move the uploaded attachment list under the attachments tab.
PHPBB3-11915
2014-01-17 19:20:35 -08:00
Cesar G
aeb215a5c2 [ticket/11915] Move some of the #cp-main table rules to separate class.
PHPBB3-11915
2014-01-17 19:20:35 -08:00
Cesar G
0ca1d14316 [ticket/12011] Correctly position the MCP minitabs.
PHPBB3-12011
2014-01-17 19:19:22 -08:00
Cesar G
68eef83a8e [ticket/12011] Prevent the <dfn> from bumping the unapproved icon to second line
A RTL rule is not needed for this since the content is just moved out of
view.

PHPBB3-12011
2014-01-17 19:19:22 -08:00
Cesar G
6b746ef029 [ticket/12011] Separate the navbar bullet points from the text.
PHPBB3-12011
2014-01-17 19:19:22 -08:00
Cesar G
be38a67768 [ticket/12011] Correctly align the posting options.
PHPBB3-12011
2014-01-17 19:15:38 -08:00
Cesar G
954cf7e064 [ticket/12011] Fix the overlapping unapproved post icon.
PHPBB3-12011
2014-01-17 19:15:38 -08:00
Cesar G
00356f7844 [ticket/12011] Align PM/post titles to the right.
PHPBB3-12011
2014-01-17 19:15:38 -08:00
Cesar G
567106988e [ticket/12011] Correctly align the pagination icon in topic rows.
PHPBB3-12011
2014-01-17 19:15:38 -08:00
Cesar G
d1edd04742 [ticket/12011] Stop the last post column from dropping to a second line.
PHPBB3-12011
2014-01-17 19:15:38 -08:00
Nathan Guse
059880debf Merge pull request #1809 from VSEphpbb/ticket/11966
[ticket/11966] Add header navigation template events to Subsilver2
2014-01-17 19:07:56 -08:00
Cesar G
d76ec60ee1 [ticket/12034] Move similar code in the two callbacks to separate function.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Cesar G
f4b832a27d [ticket/12034] AJAXify notifications popup.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Joas Schilling
558f3cd21c Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop
* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ...
2013-12-20 16:11:02 +01:00
Joas Schilling
e3e34add7f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:45 +01:00
Joas Schilling
8da2f349fe Merge remote-tracking branch 'vsephpbb/ticket/12054' into develop
* vsephpbb/ticket/12054:
  [ticket/12054] Re-word event documentation
  [ticket/12054] Reword descriptions and resort events alphabetically
  [ticket/12054] Update index_body_linklist_before/after template events
2013-12-16 10:08:19 +01:00
Joas Schilling
a999dbad74 Merge remote-tracking branch 'vsephpbb/ticket/12063' into develop
* vsephpbb/ticket/12063:
  [ticket/12063] Use CSS to replace valign=top
  [ticket/12063] Remove obsolete valign attributes from tr tags
2013-12-13 20:28:22 +01:00
Matt Friedman
7bc4571753 [ticket/12063] Use CSS to replace valign=top
PHPBB3-12063
2013-12-13 10:33:38 -08:00