| Commit message (Collapse) | Author | Age |
|
|
|
|
| |
this will be removed soon again. plugins using jQuery should make sure
they are compatible to jQuery 1.9
|
|\
| |
| |
| |
| |
| |
| |
| | |
* 'master' of git://github.com/gronke/dokuwiki:
update.js applied
update.sh must overwrite stylesheet
jQuery update.sh
jQuery latest
|
| |
| |
| |
| |
| |
| |
| | |
* jQuery 1.9.0
* jQuery-UI v1.9.2
* jQuery.fn.live > jQuery.fn.on
* jQuery.fn.browser replacement (jquery.mb.browser.js)
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* subscription: (25 commits)
link directly to subscription management in mails
only use mailfromnobody for bulk mails
added missing context for list mails
readded mailfromnobody to subscription sending
correctly escape diffs in HTML mails
fixed lists in HTML mails
simplified subscription->add() code a bit
comment adjusted
removed unused vars
removed data parameter in subscription_handle_post()
fixed tests
some reformatting
added compatibility function
moved registration notification to subscription class
fixed merge error in inc/auth.php
consolidate more notification code in subscription class
minor cleanup
initialize new subscriptions with current time
fixed subscription management
correctly check if subscriptions are enabled
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* master: (175 commits)
some coding style improvements
added .idea project folder to gitignore
use correct setUp method and parent calls.
Correct German plugin manager translation (download != install)
correct return in sendDigest()
Fix case-insensitive match in ACL checking
GeSHi update to 1.0.8.11
ignore empty header on mail sending
remove empty BCC/CC mail headers
Galician language update
some welcome page changes
Combine subsequent calls to strtr into a single transformation
changed semicolon to colon in link to welcome page to make it less confusing
fixed wrong sidebar showing in namespaces when sidebar is disabled
Typo fix for TL;DR
removed a bunch of outdated and irrelevant networking acronyms
added another place to look for logo to make it more consistent (FS#2656)
French language update
Czech language update
compat js findPosX/y more closely mimic historical function
...
Conflicts:
inc/auth.php
inc/common.php
inc/subscription.php
lib/exe/indexer.php
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
now the actual sending of bulk messages (digest, list) is reimplemented
and partially tested.
Still not complete
|
| |/
|/|
| |
| |
| |
| | |
Before this change the GIF wasn't sent at all when the PHP settings
indicate that sending of the GIF needs to be deferred and it was sent
when the debug output was on.
|
| |
| |
| |
| |
| | |
the function always returned true, even if no action was taken. This
resulted in no further indexer tasks being run.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
This prevents buffering of the cache file output.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes several problems:
- the CSS cache was only updated when either the CSS files for all media
types or one of the global files was modified
- when only the screen CSS was changed, the screen CSS was regenerated
but then the cache was printed which either caused duplicated screen
CSS output when gzip output was disabled or invalid output with gzip
enabled as first the plain text screen CSS and then the
gzip-compressed cache file was printed
Now first all CSS files are collected, then the cache is checked once
and only after this the CSS content is collected.
|
| |
| |
| |
| |
| |
| |
| | |
This simplifies a while loop in the js_compress() code. The
functionality of the new code is completely identical to the old code
but it uses less comparisons and according to FS#2593 it is thus a lot
faster.
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
pull-request-110
* 'input-validation' of git://github.com/whoopdedo/dokuwiki:
fix incorrect usage of tpl_getMediaFile
fix necessary global declaration
Input wrapper for html forms
Input validation for media manager
Input wrapper for exe scripts
more INPUT wrapper uses: cache purge, sectok, getID
Input wrapper for action.php
Conflicts:
lib/exe/css.php
|
| | |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
|
| |
| |
| |
| |
| |
| | |
See
http://stackoverflow.com/questions/805107/how-to-create-multiline-strings
for info on them.
|
| |\ |
|
| | | |
|
| |/ |
|
| | |
|
|/
|
|
|
|
|
| |
Instead of three stylesheets for 'all', 'screen' and 'print' modes, they are all loaded into a single stylesheet by wrapping all screen styles in a "@media screen {}" and all print styles in a "@media print {}". The 'all' mode is not wrapped in anything.
Potential issues with existing CSS: If any of your screen or print CSS files already contain any "@media" syntax, the CSS will probably break. In that case please add any CSS with "@media" in it to the 'all' mode instead!
Also, the 'rtl' mode is hereby deprecated. Please just prefix any RTL styles within your normal CSS files with "[dir=rtl]". This also fixes that RTL styles cannot be added for 'all' or 'print' modes.
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
lib/exe/xmlrpc.php
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
* jscachekey:
trigger JS_CACHE_USE in lib/exe/js.php
added INIT_LANG_LOAD event
let js.php use multiple caches
|
| | |
| | |
| | |
| | |
| | | |
This removes the cachekey parameter again and instead follows
@michitux's suggestion to trigger an event for the cache usage
|
| | | |
|
| | | |
|
| |\ \
| | | |
| | | | |
Improbement and "bug"fixing of the xmlrpc interface
|
| | | |
| | | |
| | | |
| | | |
| | | | |
The score was randomly transfered as string or as integer.
This way it will always be transfered as an integer.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added the new error codes and categories:
--- 212 Not allowed to delete media
== 230 Media edit error
--- 231 Filename not given
--- 232 File is still referenced
--- 233 Could not delete file
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since there are currently a lot of error coded returning 1, that mean
completly different thing, i guess it would be very nice to change this.
A client should not be forced to parse the error message, the error code
should be enough to explain the error.
This change suggests some error codes, that have a hierarchical
structure. In the following list the categories begin with = and the
error codes actually used with -.
= 100 Page errors
== 110 Page access errors
--- 111 User is not allowed to read the requested page
--- 112 User is not allowed to edit the page
== 120 Page existance errors
--- 121 The requested page does not exist
== 130 Page edit errors
--- 131 Empty page id
--- 132 Empty page content
--- 133 Page is locked
--- 134 Positive wordblock check
= 200 Media errors
== 210 Media access errors
--- 211 User is not allowed to read media
--- 215 User is not allowed to list media
== 220 Media existance errors
--- 221 The requested media does not exist
= 300 Search errors
== 310 Argument errors
--- 311 The provided value is not a valid timestamp
== 320 Search result errors
--- 321 No chances in specified timeframe
|
| | | |
| | | |
| | | | |
Without creating an IXR_Base64 object, the file will be encoded as base64, but send as string. The client XML-RPC parser cannot detect that it is meant to be a base64 encoded file.
|