mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
12,925 Commits 17 Branches 190 Tags
Commit Graph

941 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
37480e5594 [ticket/10665] Adding includejs to acp templates 
Adding includejs to acp overall_footer.html

PHPBB3-10665
 2012-04-01 20:50:59 +03: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
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
d3e7744dd6 [feature/ajax] Remove not working module enable/disable ajax code 
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
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
8a0d8c0a84 [feature/ajax] Do not hard-code sorting images of acp_forums ordering 
PHPBB3-10270
 2012-03-31 02:09:25 +02:00
Igor Wiedler
7ed2cbef75 [feature/ajax] Make phpbb.ajaxify signature use single object (more explicit) 
PHPBB3-10270
 2012-03-31 02:09:25 +02:00
Igor Wiedler
d53c36684d [feature/ajax] JavaScript strict mode 
PHPBB3-10270
 2012-03-31 02:09:24 +02:00
Igor Wiedler
628074bf70 [feature/ajax] Stylistic JavaScript adjustments 
PHPBB3-10270
 2012-03-31 02:09:24 +02:00
Igor Wiedler
30888ff2a0 [feature/ajax] Use attr('data-foo') instead of data('foo') 
data() is slower and does additional unwanted things like
caching and type conversion. Just reading the value is safer.

PHPBB3-10270
 2012-03-31 02:09:23 +02:00
Callum Macrae
81e357beef [ticket/10272] Removed some duplication calls to $.fn.data. 
PHPBB3-10272
 2012-03-31 02:09:22 +02:00
Callum Macrae
2189efadc6 [ticket/10270] Moved the AJAX error langyage entries to the footer. 
PHPBB3-10270
 2012-03-31 02:09:22 +02:00
Callum Macrae
05a88966d4 [ticket/10272] Renamed AJAX callback act_deact to activate_deactivate. 
PHPBB3-10272
 2012-03-31 02:09:22 +02:00
Callum Macrae
885c2914db [ticket/10270] Fixed JavaScript alerts in the ACP. 
PHPBB3-10270
 2012-03-31 02:09:21 +02:00
Callum Macrae
03d4ae20d1 [ticket/10271] Started using .call for javascript callbacks. 
Previously, they were just being called by appending parentheses and
functions. Now, they're being called and the element is being set as the
context instead of a parameter. It's a lot cleaner.

PHPBB3-10271
 2012-03-31 02:09:21 +02:00
Callum Macrae
8120023605 [ticket/10271] data-ajax="false" is now ignored. 
PHPBB3-10271
 2012-03-31 02:09:20 +02:00
Callum Macrae
95659ba92c [ticket/10271] Reduced calls to $ in the AJAX JavaScript. 
PHPBB3-10271
 2012-03-31 02:09:19 +02:00
Callum Macrae
1c5b1ede1c [ticket/10271] Added comments to AJAX callbacks. 
PHPBB3-10271
 2012-03-31 02:09:19 +02:00
Callum Macrae
3166cbb33d [ticket/10270] Replaced find by tag names with class names in the js. 
What it was before (selecting by tag name) could have caused some
problems for style authors.

PHPBB3-10270
 2012-03-31 02:09:18 +02:00
Callum Macrae
5b2352613e [ticket/10270] Added the alerts to the ACP footer. 
I had forgotten to do it previously.

PHPBB3-10270
 2012-03-31 02:09:18 +02:00
Callum Macrae
818d989168 [feature/ajax] Moved script.js into a few different files. 
Seperated it into: assets/javascript/core.js,
styles/prosilver/template/ajax.js and adm/style/ajax.js.

PHPBB3-10270
 2012-03-31 02:09:17 +02:00
Callum Macrae
431a78f346 [ticket/10270] Got rid of the temporary jQuery for the AJAX changes. 
The jQuery library wasn't included before, so a temporary one was
included. Now that igorws jQuery patch has been merged, the temporary
library can be removed.

PHPBB3-10270
 2012-03-31 02:09:16 +02:00
Callum Macrae
bcb824a9f2 [ticket/10272] Renamed AJAX callback "style_act_deact" to "act_deact". 
PHPBB3-10272
 2012-03-31 02:09:16 +02:00
Callum Macrae
e7e09f8da2 [ticket/10272] AJAXified the bots page in the ACP. 
PHPBB3-10272
 2012-03-31 02:09:15 +02:00
Callum Macrae
4ae74cd4b4 [ticket/10271] AJAXified buttons on acp_main. 
PHPBB3-10271
 2012-03-31 02:09:15 +02:00
Callum Macrae
1cb3b595ec [ticket/10271] AJAXified the styles tab in the ACP. 
PHPBB3-10271
 2012-03-31 02:09:15 +02:00
Callum Macrae
11112314f7 [ticket/10271] AJAXified various deletions in the ACP. 
The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields

PHPBB3-10271
 2012-03-31 02:09:15 +02:00
Callum Macrae
420de9c9a0 [ticket/10270] Moved some HTML from the JavaScript to overall_footer. 
PHPBB3-10270
 2012-03-31 02:09:14 +02:00
Callum Macrae
6efb9dd0b6 [ticket/10270] Added jQuery popup CSS to the ACP. 
It was missing previously, meaning that it displayed wrong and in the
footer.

PHPBB3-10270
 2012-03-31 02:09:14 +02:00
Callum Macrae
bb7a03f738 [ticket/10281] AJAXified reordering forums in the ACP. 
PHPBB3-10281
 2012-03-31 02:09:12 +02:00
Vjacheslav Trushkin
fd96f97dc3 [feature/merging-style-components] Updating style initialization 
Changing template initialization to style initialization.

PHPBB3-10632
 2012-03-15 21:11:34 +02:00
Vjacheslav Trushkin
39944a08b9 [feature/merging-style-components] New acp_styles template 
New acp_styles.html, completely rewritten

PHPBB3-10632
 2012-03-15 00:20:11 +02:00
Vjacheslav Trushkin
f32cc3ae8f [feature/merging-style-components] Admin.css additions for acp_styles 
Adding background colors for row iterations and font color for disabled rows to admin control panel css.

PHPBB3-10632
 2012-03-14 23:45:01 +02:00
Vjacheslav Trushkin
162f9b738a [feature/purge-cache] Allow all admins to purge cache 
Allow all administrators to purge cache

PHPBB3-10659
 2012-02-18 16:35:43 +02:00
Vjacheslav Trushkin
6d227894f5 [ticket/10645] Missing CSS for checkboxes 
Missing CSS for checkboxes, invalid cursor for radio input

PHPBB3-10645
 2012-02-13 12:28:01 +02:00
David King
2929d345ab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9914] Add backup warning to updater.
 2012-02-03 17:00:09 -05:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop 
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
 2012-02-03 16:21:51 -05:00
Michael Cullum
225892f506 [ticket/9914] Add backup warning to updater. 
PHPBB3-9914
 2012-02-03 16:14:48 +00:00
Oleg Pudeyev
466acfdd94 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10563] Show deactivated styles below active styles in acp
 2012-01-06 02:46:52 -05:00
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp 
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
 2012-01-02 21:07:40 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
David King
4baa2bb52c [ticket/10535] Removed email confirm field from acp_users module 
PHPBB3-10535
 2011-12-23 21:55:49 +00:00
Andreas Fischer
93701adf02 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
 2011-12-16 15:50:11 +01:00
Joas Schilling
730d2d5d19 [ticket/8996] Revert initial fix to keep old behaviour on empty selection 
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc.

PHPBB3-8996
 2011-12-15 22:14:59 +01:00
Oleg Pudeyev
ce797b107b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8599] Added ability to select all to add multiple smilies screen.
 2011-11-19 22:34:01 -05:00
Oleg Pudeyev
2359d1e268 Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympus 
* callumacrae/ticket/8599:
  [ticket/8599] Added ability to select all to add multiple smilies screen.
 2011-11-19 22:27:07 -05:00
Oleg Pudeyev
f5b009158c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8996] Also fix the BBCode bug in subsilver2 and acp
  [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
 2011-11-19 21:25:58 -05:00
Oleg Pudeyev
d03366fba2 Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympus 
* nickvergessen/ticket/8996:
  [ticket/8996] Also fix the BBCode bug in subsilver2 and acp
  [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
 2011-11-19 21:15:25 -05:00
Joas Schilling
eb1f15bc8b [ticket/8996] Also fix the BBCode bug in subsilver2 and acp 2011-11-18 23:27:25 +01:00