mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
12,907 Commits 17 Branches 190 Tags
Commit Graph

12907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hari Sankar R
06d26ef46e [ticket/10438] Alligning the Smileys on the same line as the text. 
Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.

PHPBB3-10438
 2012-04-02 00:35:39 +05:30
Igor Wiedler
40c37fb867 Merge remote-tracking branch 'cyberalien/ticket/10735' into develop 
* cyberalien/ticket/10735:
  [ticket/10735] Changing locator paths structure
 2012-03-31 22:51:48 +02:00
Vjacheslav Trushkin
b3f46b9565 [ticket/10735] Changing locator paths structure 
Changing locator paths to 2 dimensional array

PHPBB3-10735
 2012-03-31 21:20:18 +03:00
David King
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04:00
Igor Wiedler
1d4253319c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10675] Add disk full language string when posting attachments
 2012-03-31 19:29:56 +02:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus 
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
 2012-03-31 19:27:19 +02:00
Richard Foote
b8b342be2d [Ticket/10675] Correct language string ATTACH_DISK_FULL 
Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
 2012-03-31 12:46:44 -04:00
Nils Adermann
7e2f16aafa Merge remote-tracking branch 'github-igorw/feature/class-prefix' into develop 
* github-igorw/feature/class-prefix:
  [feature/class-prefix] Rename auth => phpbb_auth
  [feature/class-prefix] Rename user and session to phpbb_*
 2012-03-31 18:16:55 +02:00
Igor Wiedler
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth 
PHPBB3-10609
 2012-03-31 18:14:11 +02:00
Igor Wiedler
6deb7b3671 [feature/class-prefix] Rename user and session to phpbb_* 
PHPBB-10609
 2012-03-31 18:14:07 +02:00
Igor Wiedler
17a7b57074 Merge pull request #676 from cyberalien/feature/merging-style-components 
[feature/merging-style-components] Fixing typos in database updater
 2012-03-31 08:54:56 -07:00
Vjacheslav Trushkin
550ee7309a [feature/merging-style-components] Fixing typos in database updater 
Yes, I failed... again. Fixing 2 more typos in database_update.php

PHPBB3-10632
 2012-03-31 18:53:49 +03:00
Igor Wiedler
84775aaac5 Merge pull request #675 from cyberalien/feature/merging-style-components 
[feature/merging-style-components] Fixing typo in database updater
 2012-03-31 08:46:34 -07:00
Vjacheslav Trushkin
1be5bd8e13 [feature/merging-style-components] Fixing typo in database updater 
Fixing typo in database_update.php

PHPBB3-10632
 2012-03-31 18:38:37 +03:00
Igor Wiedler
0ae491c5fa Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop 
* cyberalien/feature/merging-style-components: (31 commits)
  [feature/merging-style-components] Fix back link on install page
  [feature/merging-style-components] Fix for unit tests
  [feature/merging-style-components] Moving template initialization out of style
  [feature/merging-style-components] Renaming "delete" to "uninstall" for styles
  [feature/merging-style-components] Initializing locator and provider separately
  [feature/merging-style-components] Fixing few errors in acp_styles
  [feature/merging-style-components] Fix notices in acp_styles
  [feature/merging-style-components] Updating styles in coding guidelines
  [feature/merging-style-components] Changing acp_styles text
  [feature/merging-style-components] Updating test cases
  [feature/merging-style-components] Updating style initialization
  [feature/merging-style-components] Changing style class
  [feature/merging-style-components] Changing template class
  [feature/merging-style-components] Changing resource locator
  [feature/merging-style-components] Changing path provider
  [feature/merging-style-components] Renaming style locator
  [feature/merging-style-components] Changing $style to $style_id
  [feature/merging-style-components] Creating style class
  [feature/merging-style-components] New acp_styles template
  [feature/merging-style-components] New acp_styles
  ...
 2012-03-31 17:22:54 +02:00
Igor Wiedler
5d07b16ec6 [feature/merging-style-components] Fix back link on install page 
When on install page and all styles are installed, fix back link to go to main
styles page.

PHPBB3-10632
 2012-03-31 18:20:49 +03:00
Vjacheslav Trushkin
377db78dca [feature/merging-style-components] Fix for unit tests 
Fixing typo in template unit tests

PHPBB3-10632
 2012-03-31 18:16:53 +03:00
Vjacheslav Trushkin
17989c17a0 [feature/merging-style-components] Moving template initialization out of style 
Moving template initialization out of style constructor

PHPBB3-10632
 2012-03-31 18:10:00 +03:00
Vjacheslav Trushkin
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
Vjacheslav Trushkin
360312f599 [feature/merging-style-components] Initializing locator and provider separately 
Moving locator and path provider initialization out of style class

PHPBB3-10632
 2012-03-31 17:38:30 +03:00
Vjacheslav Trushkin
9611997552 [feature/merging-style-components] Fixing few errors in acp_styles 
Fixing notices and usability issues

PHPBB3-10632
 2012-03-31 17:04:17 +03:00
Igor Wiedler
bc46cfd6e5 [feature/merging-style-components] Fix notices in acp_styles 
PHPBB3-10632
 2012-03-31 16:53:41 +03:00
Vjacheslav Trushkin
e13e4d9206 [feature/merging-style-components] Updating styles in coding guidelines 
Updating styles section in coding guidelines

PHPBB3-10632
 2012-03-31 16:33:30 +03:00
Igor Wiedler
e7a4437c1b Merge pull request #673 from naderman/ticket/10736 
[ticket/10736] Run composer in phing builds
 2012-03-31 06:23:38 -07:00
Nils Adermann
fadeefe770 [ticket/10736] Run composer in phing builds 
PHPBB3-10736
 2012-03-31 15:18:49 +02:00
Igor Wiedler
49696789c9 Merge pull request #672 from unknownbliss/ticket/10736 
[ticket/10736] Changing travis so it installs composer.phar to phpBB/
 2012-03-31 04:34:40 -07:00
Michael Cullum
3c21a8e21e [ticket/10736] Changing travis so it installs composer.phar to phpBB/ 
PHPBB3-10736
 2012-03-31 09:38:58 +01:00
Vjacheslav Trushkin
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
David King
013a8649a5 Merge remote-tracking branch 'igorw/feature/ajax' into develop 2012-03-30 20:16:00 -04:00
Igor Wiedler
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
Igor Wiedler
41d8a777dc [feature/ajax] Add entirely unrelated but nice newlines 
PHPBB3-10270
 2012-03-31 02:10:18 +02:00
Igor Wiedler
4a5172c9f7 [feature/ajax] Unify phpbb_json_response instantiation 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Igor Wiedler
ef03f8d053 [feature/ajax] Fix acp_styles activate_deactivate ajax callback name 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Igor Wiedler
8138103c6b [feature/ajax] Send correct activate/deactivate JSON response in acp_profile 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Vjacheslav Trushkin
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
Igor Wiedler
d3e7744dd6 [feature/ajax] Remove not working module enable/disable ajax code 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Igor Wiedler
9b971c9fb1 [feature/ajax] Replace static call to phpbb_request with OO 
PHPBB3-10270
 2012-03-31 02:10:17 +02:00
Igor Wiedler
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
Vjacheslav Trushkin
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
Vjacheslav Trushkin
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
Callum Macrae
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
Callum Macrae
d8e21952fa [ticket/10273] Fixed accepting / denying posts AJAX. 
PHPBB3-10273
 2012-03-31 02:10:16 +02:00
Callum Macrae
64df9d1406 [ticket/10272] Removed code that was prevent event propogation in AJAX. 
PHPBB3-10272
 2012-03-31 02:10:16 +02:00
Callum Macrae
ba56e34b6d [ticket/10291] Fixed a bug in the quick reply AJAX. 
It wasn't submitting, as jQuery was ignoring the submit value.

PHPBB3-10291
 2012-03-31 02:10:15 +02:00
Igor Wiedler
e73426fe26 [feature/ajax] Handle acp_modules error cases with JSON response 
PHPBB3-10270
 2012-03-31 02:10:15 +02:00
Igor Wiedler
2f44850a28 [feature/ajax] Fix filter check, quick mod tools data-attribute 
PHPBB3-10270
 2012-03-31 02:10:14 +02:00
Igor Wiedler
ea4362fc4c [feature/ajax] Use the error handler 
PHPBB3-10270
 2012-03-31 02:09:26 +02:00
Igor Wiedler
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box 
PHPBB3-10270
 2012-03-31 02:09:26 +02:00
Igor Wiedler
2f25173d93 [feature/ajax] Change filter semantics, some minor adjustments 
PHPBB3-10270
 2012-03-31 02:09:26 +02:00
Igor Wiedler
de82608e6f [feature/ajax] Refactor phpbb.ajaxify event callback 
PHPBB3-10270
 2012-03-31 02:09:26 +02:00