translatewiki.net
bb80085c9a
Localisation updates from https://translatewiki.net .
2017-10-12 08:36:19 +02:00
Luiza Pagliari
0e1414dcca
Allow 'placeholder' to be a localizable attribute on HTML elements ( #3257 )
2017-09-21 17:49:33 -03:00
translatewiki.net
67439545a6
Localisation updates from https://translatewiki.net .
2017-09-21 09:21:11 +02:00
translatewiki.net
3f875a56e3
Localisation updates from https://translatewiki.net .
2017-09-11 07:16:33 +02:00
translatewiki.net
457fdaa360
Localisation updates from https://translatewiki.net .
2017-09-07 07:17:26 +02:00
translatewiki.net
a0aedd6793
Localisation updates from https://translatewiki.net .
2017-08-31 07:54:29 +02:00
translatewiki.net
c62f00477e
Localisation updates from https://translatewiki.net .
2017-08-21 07:36:39 +02:00
translatewiki.net
392d649f4d
Localisation updates from https://translatewiki.net .
2017-08-17 15:31:28 +02:00
Luiza Pagliari
ed5213c9a2
Revert "[feat] Update l10n lib ( #3248 )" ( #3249 )
...
This reverts commit 6bcaa00a4b
2017-08-15 11:09:56 -03:00
Luiza Pagliari
6bcaa00a4b
[feat] Update l10n lib ( #3248 )
...
Last update was from 2014.
Fix #3244 .
2017-08-15 10:22:59 -03:00
translatewiki.net
9b9d604c09
Localisation updates from https://translatewiki.net .
2017-08-14 08:14:37 +02:00
translatewiki.net
e93d607165
Localisation updates from https://translatewiki.net .
2017-08-07 07:22:05 +02:00
Martin Honermeyer
f10e60713b
Update socket.io to 1.7.3
...
That in turn upgrades engine.io to 1.8.2. This fixes a crash for me when
running behind a traefik reverse proxy.
https://github.com/socketio/engine.io/issues/465
2017-08-04 15:42:25 +02:00
Jainendra Mandavi
b4ddd0276d
Use abiword to process .rft files
2017-08-04 03:23:12 +05:30
translatewiki.net
8abba28756
Localisation updates from https://translatewiki.net .
2017-08-03 10:39:40 +02:00
Michael Braun
4cce3bcbed
Make APIKEY und SESSIONKEY file customizable
...
Running multiple instances sometimes requires different api- and session-keys for security reasons.
2017-07-31 15:31:45 +02:00
translatewiki.net
67c4e336e0
Localisation updates from https://translatewiki.net .
2017-07-31 14:58:13 +02:00
Stefan
f6456c0aa7
Merge pull request #3187 from tiblu/ep_prefs_different_cookie_for_different_protocol
...
#3179 - Using EP on same domain, but over different protocols causes "Warning: it appears that your browser does not have cookies enabled.
2017-07-30 11:49:29 +02:00
Stefan
5382b06ede
Merge pull request #3231 from jainendra/fix-2864-import-pdf
...
FIX-2864: Add useAbiword flag
2017-07-30 11:42:39 +02:00
Jainendra Mandavi
e4ddb42e11
FIX-2864: Add useAbiword flag
...
This is a fix for the issue - 2864
Which is import failure of PDF after importing a text file
2017-07-28 23:13:07 +05:30
translatewiki.net
65fc8d830b
Localisation updates from https://translatewiki.net .
2017-07-27 10:10:28 +02:00
Matic Potočnik
cdaee77a76
Fix AbiWord wikilink and capitalization ( #3227 )
2017-07-26 21:42:42 -03:00
Jan Holub
8bd8be97b9
Added support for the Montserrat Font as discussed in #3201 ( #3205 )
...
* Added support for the Montserrat Font as discussed in #3201
I chose a thin version of the Font (namely Montserrat Light) as the regular font and Montserrat Regular as the bold version. The thin fonts just look better in my opinion.
2017-07-12 12:21:48 -03:00
Luiza Pagliari
8c57c8d0d6
Merge pull request #3206 from 00SteinsGate00/RobotoMono
...
Added RobotoMono as a more modern and pretty monospaced font
2017-07-12 08:02:08 -03:00
Luiza Pagliari
3e5d71ad5a
Merge pull request #3214 from patrickeasters/add_credentials_arg
...
Add credentials arg to CLI module
2017-07-12 07:22:17 -03:00
Mikołaj Biel
2508b9749c
fix typo
2017-07-10 20:59:08 +02:00
Mikołaj Biel
35702a0589
[feat] New server-side hook: onAccessCheck
2017-07-10 20:54:32 +02:00
translatewiki.net
f9203524a4
Localisation updates from https://translatewiki.net .
2017-07-06 11:10:08 +02:00
Patrick Easters
d72d79ea82
Fetch credentials arg from CLI
2017-07-05 15:20:02 -04:00
translatewiki.net
12cb8e0dc1
Localisation updates from https://translatewiki.net .
2017-07-04 10:04:28 +02:00
translatewiki.net
b2ba0625f7
Localisation updates from https://translatewiki.net .
2017-07-03 07:35:44 +02:00
translatewiki.net
7b4f672b79
Localisation updates from https://translatewiki.net .
2017-06-26 09:07:27 +02:00
Jan Holub
7029248a76
Added RobotoMono as a more modern and pretty monospaced font, addressing #3201
...
I added RobotoMono-Regular and RobotoMono-Bold as TrueTypeFont files and included them into the list. I tred to stay in alphabetical order where possible.
The author of #3201 was asking for a more modern monospaced font.
2017-06-21 23:44:23 +02:00
translatewiki.net
2e77a28695
Localisation updates from https://translatewiki.net .
2017-06-19 14:10:49 +02:00
translatewiki.net
0fdb031839
Localisation updates from https://translatewiki.net .
2017-06-15 07:47:04 +02:00
translatewiki.net
1db87e1133
Localisation updates from https://translatewiki.net .
2017-06-05 07:34:21 +02:00
translatewiki.net
1c26ac5c6f
Localisation updates from https://translatewiki.net .
2017-06-01 07:15:35 +02:00
Claudius Mbemba
8d60bd5234
fixed plugin dependency issue
...
running ./bin/run.sh after the 1st time caused the following error "TypeError: Cannot read property 'dependencies' of undefined".
fixed it.
2017-05-30 05:36:29 +02:00
Luiza Pagliari
b6cb46271b
Merge pull request #3182 from storytouch/fix/do_not_hide_force_reconnect_modal
...
Improvements on modals and "force reconnect" messages
2017-05-29 11:05:37 -03:00
translatewiki.net
faefa8a9ef
Localisation updates from https://translatewiki.net .
2017-05-29 07:50:59 +02:00
translatewiki.net
c7dac38af5
Localisation updates from https://translatewiki.net .
2017-05-21 09:52:24 +02:00
translatewiki.net
66df56559c
Localisation updates from https://translatewiki.net .
2017-05-20 10:53:31 +02:00
Luiza Pagliari
fc89034a55
[feat] New server-side hook: padCopy
...
Let plugins know when a pad is copied.
2017-05-18 18:52:14 -03:00
Luiza Pagliari
894ebffcaf
[fix] Do not close ANY "force reconnect" message
...
Fix previous commit. As "force reconnect" buttons have all the same id
on DOM, on the previous commit we were only disallowing the first button
with that id on DOM -- "userdup" -- to be closed by a click on editor.
Casually the tests were using the same error to simulate a "force
reconnect", so even the tests were not getting the issue.
2017-05-12 07:03:40 -03:00
Luiza Pagliari
0cb8d31e95
[fix] Have one setting for each shortcut to create ordered list
...
This is an adjustment to #2891 .
2017-05-11 14:56:09 -03:00
Luiza Pagliari
97038c2183
[fix] Fix shortcut enabling flag for 'ESC'
...
This is an adjustment to #2891 .
2017-05-11 12:36:20 -03:00
Luiza Pagliari
cf686282ef
Do not use cookie for pad shortcuts
...
Users still cannot choose which shortcuts they want to enable/disable,
so it does not make sense (yet) to have a cookie with that preference.
This can be reverted once we create an UI to change shortcuts, but
PLEASE PLEASE PLEASE do not read the cookie every time handleKeyEvent is
called!!!
This is an adjustment to #2891 .
2017-05-11 12:26:14 -03:00
Luiza Pagliari
1ebcf0dc47
Merge pull request #2891 from bhldev/padShortcutDisable
...
Added pad shortcut disabling feature to settings.json
2017-05-11 11:29:25 -03:00
translatewiki.net
ef415880f0
Localisation updates from https://translatewiki.net .
2017-05-11 08:32:44 +02:00
Mikk Andresen
c959cdbaa7
Pad_cookie.js to have isCookiesEnabled() cause wasNoCookie() is also true when User visits first time.
2017-05-05 11:17:07 +03:00
Mikk Andresen
582e2c3819
Use padcookie instead of raw prefs cookie reading
2017-05-05 11:07:54 +03:00
Mikk Andresen
7790c5606b
Fix regexp
2017-05-05 10:54:26 +03:00
Mikk Andresen
96cc1ad55a
Use different cookie name for different protocols - https://github.com/ether/etherpad-lite/issues/3179
2017-05-05 10:28:44 +03:00
Luiza Pagliari
9176bf9bad
[fix] Do not close "force reconnect" messages
...
If a "force reconnect" message is displayed to the user, it means the
only way to go back to a healthy state is to reload the pad. So we
cannot hide this kind of message, like what is done with other modals
(eg: "settings").
2017-05-04 14:34:01 -03:00
Luiza Pagliari
4eec3763b4
[fix] Close modals when user clicks both on pad inner and outer
...
Also: split tests for automatic reconnection and regular modal tests.
2017-05-04 11:22:18 -03:00
translatewiki.net
b43137ad2c
Localisation updates from https://translatewiki.net .
2017-05-04 07:42:20 +02:00
Luiza Pagliari
0bd4169663
[fix] Block user from changing pad after he/she is disconnected
...
Use same approach of when channel state is chaged to "DISCONNECTED".
2017-05-03 12:59:57 -03:00
translatewiki.net
32ed4315e2
Localisation updates from https://translatewiki.net .
2017-05-02 07:52:46 +02:00
translatewiki.net
51910e9187
Localisation updates from https://translatewiki.net .
2017-04-27 08:11:23 +02:00
translatewiki.net
5f0e7e01d7
Localisation updates from https://translatewiki.net .
2017-04-24 19:46:41 +02:00
translatewiki.net
bc5c8ec0cf
Localisation updates from https://translatewiki.net .
2017-04-20 07:28:20 +02:00
Luiza Pagliari
8081164a72
Merge pull request #3161 from ether/feature/automatic_force_reconnect
...
Feature: automatic force reconnect
2017-04-18 10:21:19 -03:00
Adam Niederer
11813f33a5
Butt On -> button
2017-04-15 20:12:44 -04:00
translatewiki.net
eea9304b4d
Localisation updates from https://translatewiki.net .
2017-04-06 07:14:59 +02:00
Luiza Pagliari
384697f653
[feature] Only automatically reconnect if can establish connection to server
...
Avoid trying to reload pad when network is not available.
2017-04-05 15:07:37 -03:00
Luiza Pagliari
0eae83f252
[feature] i18n for automatic reconnection messages/buttons
2017-04-04 18:09:33 -03:00
Luiza Pagliari
009cd31243
[feature] Create option to automatically reconnect after a few seconds
...
On some erros that display a modal with "Force reconnect" button, allow
Etherpad to automatically reload pad after a few seconds. Amount of
seconds is defined on settings.json.
Still need to create tests for this feature, and implement i18n.
2017-04-04 11:09:24 -03:00
translatewiki.net
cf6b246688
Localisation updates from https://translatewiki.net .
2017-04-03 07:25:13 +02:00
translatewiki.net
ed029b599e
Localisation updates from https://translatewiki.net .
2017-03-30 07:40:12 +02:00
translatewiki.net
ce2c74d120
Localisation updates from https://translatewiki.net .
2017-03-20 07:24:19 +01:00
translatewiki.net
5eadc715a6
Localisation updates from https://translatewiki.net .
2017-03-13 08:08:38 +01:00
translatewiki.net
bc0eff6dd0
Localisation updates from https://translatewiki.net .
2017-03-06 08:49:04 +01:00
translatewiki.net
9515109308
Localisation updates from https://translatewiki.net .
2017-02-27 07:48:12 +01:00
translatewiki.net
393f651770
Localisation updates from https://translatewiki.net .
2017-02-23 09:00:01 +01:00
Luiza Pagliari
203a48b42d
Merge pull request #3136 from joassouza/fix_minify
...
Fix minification of JS files
2017-02-08 04:14:44 -02:00
joassouza
0025613ba6
Refactor code
2017-02-07 15:06:49 -02:00
joassouza
d1e6c8492d
Fix minification of code
2017-02-07 13:04:22 -02:00
translatewiki.net
306e63c3f5
Localisation updates from https://translatewiki.net .
2017-02-06 07:52:00 +01:00
Luiza Pagliari
a6436ac8d2
Merge pull request #3119 from storytouch/fix_3118
...
Create plugin to run tests for line attribs + fix #3118
2017-02-02 17:54:20 -02:00
Pablo Saavedra
f5810957b4
This WA is not longer required in the newest Chrome see comments in the issue: ether#2078
...
The hack is still necessary in Firefox 51
2017-02-02 13:53:32 +01:00
Stefan
40f54fed38
Merge pull request #3131 from Sjord/remove-outdated-comment
...
Remove deprecated comment
2017-01-29 12:54:17 +01:00
Sjoerd Langkemper
21a6e66e25
Remove deprecated comment
...
The session key is currently stored in SESSIONKEY.txt, so it is no longer reset
every time the server starts.
2017-01-26 09:59:09 +01:00
Luiza Pagliari
b2d9f57338
[fix] Consider line attribs of plugins when building changesets
...
When checking the places on text that are identical between content
before and after a changeset, we were considering only the standard
(Etherpad-core) attributes, and not taking into account attributes
created by the plugins. One consequence was that the '*' marker of lines
with line attribs were being kept, even when the new lines have
different line attribs. See #3118 for more details.
Fix #3118 .
2017-01-12 12:42:56 -02:00
noerw
cc69e76200
redirect /admin properly ( fix #3114 )
2017-01-06 18:19:38 +01:00
Niklas Laxström
deed74c8c8
Localisation updates from https://translatewiki.net .
2017-01-02 09:00:13 +01:00
Niklas Laxström
f217e29071
Localisation updates from https://translatewiki.net .
2016-12-29 08:24:55 +01:00
Stefan
6dc808ad54
Release version 1.6.1
2016-12-23 21:59:57 +01:00
Stefan
be9ff4a0de
Fixed crash on invalid export url
2016-12-22 23:04:06 +01:00
Stefan
efb25f417a
Merge pull request #2993 from ether/fixes-2945
...
fixes #2945
2016-12-20 22:08:05 +01:00
Stefan
a1ec061017
Merge pull request #3053 from danfuzz/fix-timeslider-lists
...
Fix timeslider lists / indents, but also make CSS `@import` work
2016-12-20 22:06:31 +01:00
Stefan
8084400e13
Try to init cookies before testing if it exists
2016-12-20 21:57:01 +01:00
Stefan
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
Stefan
368bbe4836
Merge pull request #3084 from Gared/fix_npm_node7
...
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-12-20 00:07:26 +01:00
Niklas Laxström
db94ce9413
Localisation updates from https://translatewiki.net .
2016-12-19 07:36:35 +01:00
Niklas Laxström
d13a28a1ea
Localisation updates from https://translatewiki.net .
2016-12-15 07:31:34 +01:00
Luiza Pagliari
01d23b1f6a
Merge pull request #2929 from xavidotron/develop
...
Pass through the "item" parameter to registerAceCommand callbacks.
2016-12-13 06:12:26 -02:00
Stefan
da5ae8b1f7
Merge pull request #3085 from Gared/fix_socketio_options
...
Updated option parameters for socket.io to work with latest version
2016-12-12 23:40:29 +01:00
Niklas Laxström
b41b4726d6
Localisation updates from https://translatewiki.net .
2016-11-24 08:24:37 +01:00
Stefan
352cec1811
Updated socket.io to 1.6.0
2016-11-20 12:44:59 +01:00
Stefan
39a3bedb7b
Updated option parameters for socket.io to work with latest version
2016-11-20 12:27:27 +01:00
Stefan
00c9caf7a3
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-11-20 11:28:17 +01:00
Siebrand Mazeland
602fd4629a
Localisation updates from https://translatewiki.net .
2016-11-17 09:50:45 +01:00
Paul Carver
573b55af8b
Correct the spelling of occured to occurred
...
The correct spelling is occurred. See
http://www.gingersoftware.com/english-online/spelling-book/misspelling/occurred-occured-ocurred
or other dictionary search results.
2016-11-11 12:46:40 -05:00
Niklas Laxström
223127bf39
Localisation updates from https://translatewiki.net .
2016-11-01 07:59:29 +01:00
Niklas Laxström
7dd934f714
Localisation updates from https://translatewiki.net .
2016-10-17 20:19:22 +02:00
Niklas Laxström
2c69511c62
Localisation updates from https://translatewiki.net .
2016-10-13 08:00:32 +02:00
Niklas Laxström
965af5a40b
Localisation updates from https://translatewiki.net .
2016-10-06 07:41:01 +02:00
rugk
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
...
Conflicts:
src/templates/index.html
2016-09-30 19:20:40 +02:00
John McLear
f289611ba9
Merge pull request #3059 from paper-pauper/librejs
...
Added LibreJS support
2016-09-28 23:02:40 +01:00
Niklas Laxström
93ca44f005
Localisation updates from https://translatewiki.net .
2016-09-27 13:58:36 +02:00
Niklas Laxström
b6e5a2283b
Localisation updates from https://translatewiki.net .
2016-09-22 07:27:50 +02:00
Nobody Really
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +02:00
Niklas Laxström
32eb6a2288
Localisation updates from https://translatewiki.net .
2016-09-15 08:18:13 +02:00
Niklas Laxström
7ecf240d9e
Localisation updates from https://translatewiki.net .
2016-09-13 07:44:27 +02:00
Dan Bornstein
0a9d02562d
Handle relative paths properly, when @importing.
2016-09-09 12:59:02 -07:00
Dan Bornstein
d7940cf8c5
Harmonize list- and indent-related CSS in the pad editor and timeslider.
...
* Add a new file `lists_and_indents.css` to hold the common CSS.
* Remove the corresponding CSS from `iframe_editor.css`, replacing it with
an `@import` of the new file.
* Remove the list/indent code from `timeslider.css`, which was _unlike_ the
corresponding editor CSS code, again replacing it with an `@import` of the
new file.
2016-09-09 12:33:46 -07:00
Dan Bornstein
a5a7ebea3d
Handle @import during CSS minification.
...
This meant plumbing a callback through to `compressCSS()`, which meant that
I had to alter the innards of `getFileCompressed()`. I tried to leave that
function looking more understandable than when I found it; for example, I
flattened out the nested `if`.
I went ahead and upgraded the version of `clean-css` while I was in the
territory.
2016-09-09 12:32:24 -07:00
Luiza Pagliari
7dd252f763
Merge pull request #3045 from danfuzz/extract-export-css
...
Use an EEJS template for HTML export instead of inlining it in the JS code.
2016-09-08 19:15:10 -03:00
Dan Bornstein
a0403ffc22
Remove unused parameter noDocType.
...
My editor also auto-stripped some EOL whitespace.
2016-09-08 09:46:13 -07:00
Dan Bornstein
879ae7c67d
Remove the noDocType argument, which was only ever passed as false.
2016-09-08 09:41:23 -07:00
Luiza Pagliari
5022912895
Merge pull request #3048 from danfuzz/fix-first-line-margin-top
...
Account for any top margin on the first line.
2016-09-08 05:59:36 -03:00
Niklas Laxström
b502c855d2
Localisation updates from https://translatewiki.net .
2016-09-08 10:08:19 +02:00
Niklas Laxström
fd7591c110
Localisation updates from https://translatewiki.net .
2016-09-05 07:14:04 +02:00
Dan Bornstein
a3765d9785
Account for any top margin on the first line.
...
Without this change, a top margin on any element on the first line of pad
content would throw off the alignment of line numbers. The default stylesheet
doesn't define any elements with top margins, but plugins might. (This is also
explained in a code comment.)
In order to see the problem, add the following clause to `iframe_editor.css`
(before incorporating this commit):
#innerdocbody > :first-child {
margin-top: 100px;
}
2016-08-30 11:19:28 -07:00
Niklas Laxström
8ad9d4f6dd
Localisation updates from https://translatewiki.net .
2016-08-25 07:33:25 +02:00
Dan Bornstein
6d7f128b87
Use an EEJS template for HTML export instead of inlining it in the JS code.
...
The semantics of all the substitutions are identical to what they were before.
I _did_ take the liberty of formatting the CSS to be a bit more readable
(at the cost of adding a little bit of whitespace).
2016-08-24 16:25:31 -07:00
rugk
b5632b3ac5
Index: No-referrer
2016-08-23 22:12:40 +02:00
rugk
bf99cf92ab
Pad: Add no-referrer
2016-08-23 22:12:12 +02:00
rugk
8f133abacc
Timeslider: Add no-referrer
2016-08-23 22:11:11 +02:00
Luiza Pagliari
ea562250d9
Perform drag and drop in one changeset, so UNDO works properly. Fix #3041
2016-08-22 18:44:17 -03:00
Niklas Laxström
bd20d44e89
Localisation updates from https://translatewiki.net .
2016-08-18 07:52:23 +02:00
Niklas Laxström
f147146519
Localisation updates from https://translatewiki.net .
2016-08-15 08:08:30 +02:00
Niklas Laxström
2996f0fad7
Localisation updates from https://translatewiki.net .
2016-08-04 07:57:38 +02:00
Niklas Laxström
08b90437c1
Localisation updates from https://translatewiki.net .
2016-08-01 08:08:45 +02:00
Niklas Laxström
cf3aaa334f
Localisation updates from https://translatewiki.net .
2016-07-28 07:59:29 +02:00
Niklas Laxström
17726856c6
Localisation updates from https://translatewiki.net .
2016-07-25 07:56:41 +02:00
Luiza Pagliari
c92e3e4b5e
Fix #2918 . Re-enable editor after user is reconnected to server
2016-07-21 15:23:14 -03:00
Niklas Laxström
3fcc7aa190
Localisation updates from https://translatewiki.net .
2016-07-18 08:48:25 +02:00
Stefan
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02:00
Niklas Laxström
728ab9307e
Localisation updates from https://translatewiki.net .
2016-07-07 07:52:57 +02:00
John McLear
ab4f23aae5
Merge pull request #2970 from xavidotron/url
...
Remove [ and ] from the regexp used by the URL filter.
2016-06-28 07:28:18 +01:00
John McLear
65dcb783d1
Merge pull request #3008 from Gared/directory_check
...
Fixed path check
2016-06-22 21:50:34 +01:00
Siebrand Mazeland
a18d40df6b
Localisation updates from https://translatewiki.net .
2016-06-22 16:38:16 +02:00
John McLear
f09e10b122
Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEvents
...
Create hook to register events that won't scroll editor after aceEditEvt
2016-06-20 10:36:53 +01:00
Niklas Laxström
3f4c8d35d6
Localisation updates from https://translatewiki.net .
2016-06-20 07:52:44 +02:00
Stefan
6b9711cb70
Fixed path check
2016-06-20 00:22:29 +02:00
Niklas Laxström
85cdb1cf4e
Localisation updates from https://translatewiki.net .
2016-06-16 08:11:53 +02:00
John McLear
b3b17c2190
Merge pull request #2991 from LokeshN/deactivate-settings
...
Issue #2960 - deactivate settings.json
2016-06-13 14:41:30 +08:00
Niklas Laxström
25fd246091
Localisation updates from https://translatewiki.net .
2016-06-13 07:44:13 +02:00
Stefan
4ea9c4f98d
Add secure flag to express-session cookies
2016-06-08 21:15:26 +02:00
Stefan
06ff023047
Add secure flag to cookies on client side if pad accessed through https
2016-06-08 21:14:10 +02:00
Stefan
93dae51cda
Remove test cookie
2016-06-08 21:12:27 +02:00
Stefan
44370f11be
Merge pull request #2957 from ether/dependency_updates
...
Dependency updates
2016-06-07 21:32:20 +02:00
Stefan
5a868254e3
Merge pull request #2986 from Gared/fix_existssync_deprecated
...
Use fs.statSync instead of fs.existsSync (deprecated)
2016-06-07 21:30:22 +02:00
Niklas Laxström
3ea27d2613
Localisation updates from https://translatewiki.net .
2016-06-06 08:09:26 +02:00
John McLear
d545630912
fixes #2945
2016-05-28 22:25:44 +01:00
Niklas Laxström
a7405825a8
Localisation updates from https://translatewiki.net .
2016-05-26 07:57:20 +02:00
LokeshN
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
John McLear
73414df3c7
heh whoops :)
2016-05-20 14:43:01 +01:00
John McLear
a8487dd5dc
client Var value for disabling scripts
2016-05-20 14:42:05 +01:00
Niklas Laxström
94920e5552
Localisation updates from https://translatewiki.net .
2016-05-19 09:25:51 +02:00
Stefan
835bca7967
Use fs.statSync instead of fs.existsSync (deprecated)
2016-05-16 16:51:12 +02:00
Niklas Laxström
b24e62f90a
Localisation updates from https://translatewiki.net .
2016-05-12 08:59:06 +02:00
Xavid
9022877cc6
Remove [ and ] from the regexp used by the URL filter.
...
These characters are rarely used in URLs, and including them leads to
mislinkifying when editing various formats, such as wiki markup formats that
use [] around links.
2016-05-06 22:04:37 -04:00
Xavid
56b851a46f
Pass through the "item" parameter to registerAceCommand callbacks.
2016-05-06 21:58:24 -04:00
Stefan
2c177f553a
Updated several dependencies to latest version
2016-05-02 19:46:36 +02:00
Niklas Laxström
c5638dd7e5
Localisation updates from https://translatewiki.net .
2016-05-02 07:25:28 +02:00
Stefan
14e1f3bf22
Update socket.io to version 1.4.5
2016-04-26 18:55:58 +02:00
Stefan
ebe44b0eab
Release version 1.6.0
2016-04-24 21:03:42 +02:00
Niklas Laxström
15c9041f12
Localisation updates from https://translatewiki.net .
2016-04-18 07:04:42 +02:00
Niklas Laxström
6e78895cdd
Localisation updates from https://translatewiki.net .
2016-04-11 07:07:32 +02:00
John McLear
6b6a028355
include the padId
2016-04-09 20:01:49 +01:00
Niklas Laxström
21372c93a3
Localisation updates from https://translatewiki.net .
2016-04-07 08:00:19 +02:00
John McLear
282b1cdcfe
Merge pull request #2940 from ether/extend-getAttributesOnSelection
...
extend attributesonselection method
2016-04-05 22:30:15 +01:00
Luiza Pagliari
3fb695a7a0
Create hook to register events that won't scroll editor after aceEditEvt
2016-03-30 11:51:18 -03:00
Stefan
103e07e828
Fix document.domain error in frontend tests
2016-03-29 16:16:22 +02:00
Niklas Laxström
8f2f01dff8
Localisation updates from https://translatewiki.net .
2016-03-28 10:09:39 +02:00
John McLear
6f2e155668
Merge pull request #2898 from rohieb/feature/more-uri-schemes
...
Highlight and link more URI schemes: about, geo, tel
2016-03-26 22:14:38 +08:00
John McLear
8df8228a36
Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine
...
Update author when removing line attribute from line
2016-03-26 22:11:22 +08:00
John McLear
97b971747f
forgot this one
2016-03-26 22:01:26 +08:00
John McLear
4846798528
extend attributesonselection method
2016-03-26 22:00:34 +08:00
Niklas Laxström
7dd26bd250
Localisation updates from https://translatewiki.net .
2016-03-24 07:15:23 +01:00
Niklas Laxström
04e8b0c184
Localisation updates from https://translatewiki.net .
2016-03-21 07:09:41 +01:00
Stefan
02551d772c
Fix a possible xss attack in iframe link
2016-03-20 16:28:06 +01:00
Niklas Laxström
175c29ff66
Localisation updates from https://translatewiki.net .
2016-03-17 08:47:38 +01:00
Luiza Pagliari
9bcf8690c0
Update author when removing line attribute from line
...
This avoids raising error 'Trying to submit changes as another author in
changeset' when 2 authors change line attributes of the same line. This
fixes issue #2925 .
2016-03-15 15:44:00 -03:00
Niklas Laxström
a3188cf357
Localisation updates from https://translatewiki.net .
2016-03-14 08:09:25 +01:00
Siebrand Mazeland
b6ab6f2b13
Localisation updates from https://translatewiki.net .
2016-03-09 13:38:20 +01:00
Siebrand Mazeland
d88052726d
Localisation updates from https://translatewiki.net .
2016-02-19 15:05:09 +01:00
Stefan
6df7ff2d08
Merge pull request #2893 from bhldev/cssFontColors
...
Css default colors Issue #2853
2016-02-14 14:54:13 +01:00
Niklas Laxström
8b8811c7ad
Localisation updates from https://translatewiki.net .
2016-02-08 11:36:53 +01:00
Stefan
32d90418ca
Merge pull request #2890 from bhldev/languageTimesliderUrlParameter
...
Timeslider Not Translated Issue 2885
2016-02-06 22:38:02 +01:00
Niklas Laxström
319ebb29fd
Localisation updates from https://translatewiki.net .
2016-02-01 09:23:34 +01:00
Roland Hieber
dde4fdfdbd
Highlight and link more URI schemes: about, geo, tel
2016-01-30 19:03:42 +01:00
Niklas Laxström
b46e5db777
Localisation updates from https://translatewiki.net .
2016-01-25 07:38:47 +01:00
Stefan
fbe3710dda
Merge pull request #2863 from gutobenn/padname-size
...
Limit padname input field to 50 characters
2016-01-23 13:51:57 +01:00
Brian Lim
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
Brian Lim
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
Brian Lim
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
John McLear
d994baeefa
Merge pull request #2886 from bhldev/padOptionsLang
...
Set language cookie on initial load Issue #2882
2016-01-19 23:48:30 +00:00
John McLear
13d9bdf03a
Merge pull request #2887 from bhldev/editorListIndentOutdent
...
Editor List Fix for 2844 and 2812
2016-01-19 23:48:20 +00:00
Brian Lim
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
Niklas Laxström
0b521f6528
Localisation updates from https://translatewiki.net .
2016-01-18 08:01:50 +01:00
Brian Lim
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
John McLear
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00:00
Niklas Laxström
855bd270bd
Localisation updates from https://translatewiki.net .
2016-01-11 08:28:02 +01:00
John McLear
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
John McLear
50c6b5ed61
tidy up
2016-01-10 14:39:41 +00:00
John McLear
ef9cf974a2
Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-between-frames-sandbox
2016-01-10 14:37:44 +00:00
John McLear
f80407c6ff
removal
2016-01-08 13:41:52 +00:00
John McLear
cb874b695b
herp
2016-01-08 13:40:25 +00:00
John McLear
ae6110919f
removal
2016-01-08 13:39:59 +00:00
John McLear
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
John McLear
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
John McLear
638757fdb5
Update DB.js
2016-01-06 00:01:48 +00:00
John McLear
dbc777dd13
Merge pull request #2871 from tiblu/pad_userlist_add_usersOnline_fix_bug_in_users
...
pad_userlist.js: BUGFIX: users() returning duplicates on several calls. FEATURE: usersOnline() returns only online users
2016-01-05 21:15:52 +00:00
Mikk Andresen
ccbcf0ddce
Add usersOnline function to pad_userlist, fix a bug where several occurances of current user were pushed to users list.
2016-01-05 18:22:32 +02:00
John McLear
239f517afd
Update package.json
2016-01-03 01:03:05 +00:00
Mikk Andresen
aab7186486
Fix handleClientMessage_USER_* payloads not containing user info
2015-12-31 14:19:23 +02:00
Niklas Laxström
2e81b39028
Localisation updates from https://translatewiki.net .
2015-12-29 10:44:17 +01:00
John McLear
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
Augusto Bennemann
a34c8e4721
Limit padname size to 50 characters
2015-12-22 13:25:56 -02:00
John McLear
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
John McLear
577102b025
license
2015-12-21 16:29:09 +00:00
Chris Birk
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
Chris Birk
313f390e7a
remove logging
2015-12-17 21:56:33 -06:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
e98821cef7
bump socketio
2015-12-07 13:48:05 +00:00
John McLear
bf6e225aa2
include event on paste and drrororororop
2015-12-05 19:06:40 +00:00
John McLear
b3d44b6956
remove con log
2015-12-05 18:51:27 +00:00
John McLear
fa492dc926
ace drop event
2015-12-05 18:50:51 +00:00
John McLear
e2a0e3cd7f
whoops
2015-12-02 12:10:25 +00:00
John McLear
98016665e4
working logic
2015-12-02 11:54:37 +00:00
John McLear
1a303f06b6
Merge pull request #2850 from tiblu/aceEditorCSS_allow_external_css
...
aceEditorCSS hook to allow absolute paths to resources to include external CSS
2015-12-02 11:26:38 +00:00
John McLear
f44c444720
Merge pull request #2831 from fcassin/develop
...
Protect against a null atext value in cloneAText
2015-12-01 17:50:29 +00:00
John McLear
16bb28a0ff
Merge pull request #2848 from storytouch/develop
...
Update the bowser.js to the new version
2015-12-01 17:47:00 +00:00
John McLear
1a8462fb4f
remove unused variable
2015-12-01 17:40:16 +00:00
John McLear
4ae88b2ee7
Hook for export ocnvert control
2015-12-01 17:38:52 +00:00
joassouza
4c8c1f53b5
Update the bowser.js to the new version
...
With this new version of bowser.js is possible detect the OS as well,
no only the browser as the previous one. It brings support to
new browsers as well.
2015-12-01 11:53:49 -03:00
Mikk Andresen
ad2ea924b5
aceEditorCSS to allow absolute paths to resources to include external CSS
2015-12-01 14:16:44 +02:00
John McLear
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
John McLear
a8c2833759
clean up
2015-11-24 14:03:38 +00:00
John McLear
039a761eaf
allow settings to be applied from the filesystem
2015-11-24 14:02:37 +00:00
Francois Cassin
2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01:00
John McLear
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +00:00
Luiza Pagliari
92a8253449
Create hook exportHtmlAdditionalTagsWithData
...
The new hook does the same as exportHtmlAdditionalTags, but is declared
in another hook to avoid confusion about how to export tags when they
are stored as ['tag', 'value'] on attribute pool.
This complements #2762 , as per @Gared suggestions.
2015-11-03 07:16:55 -02:00
John McLear
d05fa6d97e
Merge pull request #2819 from bradarv90/develop
...
Fix for #2809
2015-11-02 13:09:42 +00:00
John McLear
c575c8b447
Merge pull request #2820 from storytouch/fix_2818
...
Fix logic to check if any hook handled ACE key event. Fix #2818
2015-11-02 13:08:30 +00:00
John McLear
2b980653d6
Merge pull request #2822 from storytouch/esc
...
Allow plugins handle "esc" key event
2015-11-02 13:08:01 +00:00
Luiza Pagliari
478f5788e3
Add callstack to aceSelectionChanged context
2015-10-30 12:13:43 -02:00
joassouza
959de82e2a
Allow plugins handle "esc" key event
2015-10-29 14:54:21 -03:00
Bradley Arvin
a9d7ab9e18
Fix for #2809
2015-10-28 13:28:54 -04:00
Luiza Pagliari
c551fe4c1e
Fix logic to check if any hook handled ACE key event. Fix #2818
...
Instead of checking if only the first hook had returned true, we check
all hooks.
2015-10-27 07:44:51 -02:00
John McLear
c337a0585c
Merge pull request #2724 from xavidotron/develop
...
Add a aceSelectionChanged hook to allow plugins to react when the cursor moves
2015-10-22 16:19:07 +01:00
John McLear
08c6e3e29f
Merge pull request #2739 from otetard/bugfix/fix_space_removal
...
Avoid space removal when pasting text from word processor.
2015-10-22 16:18:29 +01:00
John McLear
0d769632df
Merge pull request #2748 from CodeMichael/develop
...
allow /admin to run in a subdirectory
2015-10-22 16:17:10 +01:00
John McLear
3aff0001a1
Merge pull request #2798 from ypid/fixed_get_git_hash
...
Get git commit hash even if the repo only points to a bare repo.
2015-10-22 16:13:58 +01:00
John McLear
50171a4c3c
Merge pull request #2805 from storytouch/indentationSetting
...
Create setting to control if a new line will be indented or not
2015-10-22 16:12:07 +01:00
John McLear
5652adb4eb
Merge pull request #2813 from simong/export-libreoffice
...
Allow LibreOffice to be used when exporting a pad
2015-10-22 16:11:26 +01:00
John McLear
5df580ddee
Merge pull request #2810 from luser/append-text
...
Add an appendText API
2015-10-22 16:10:21 +01:00
Simon Gaeremynck
7289e89070
Use Etherpad rather than Etherpad Lite when exporting HTML
2015-10-22 16:09:44 +01:00
Siebrand Mazeland
f57aaa62fc
Localisation updates from https://translatewiki.net .
2015-10-22 11:32:46 +02:00
John McLear
82c7ca4ac3
add classes for bootstrap targeting, pew pew
2015-10-22 01:32:02 +01:00
Simon Gaeremynck
2bfc3026d2
Allow LibreOffice to be used when exporting a pad
...
This commit adds support for LibreOffice when exporting a pad to doc, pdf, ..
This commit also cleans up some export logic when exporting to txt
2015-10-20 19:46:08 +01:00
Ted Mielczarek
a675659dc2
Add an appendText API
2015-10-19 15:27:09 -04:00
Stefan
504cc102a0
Merge pull request #2762 from storytouch/exportTagsAsArrays
...
Accepting Arrays on 'exportHtmlAdditionalTags'
2015-10-17 18:24:18 +02:00
Siebrand Mazeland
0ab3f3133e
Localisation updates from https://translatewiki.net .
2015-10-14 12:54:49 +02:00
Luiza Pagliari
5deb06d589
Create setting to control if a new line will be indented or not
...
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
2015-10-13 18:39:23 -03:00
Stefan
9d29b15def
Merge pull request #2730 from emilyxxie/clientready_hook
...
added clientReady hook
2015-10-10 13:30:36 +02:00
Stefan
22bf9c9297
Merge pull request #2799 from Gared/fix_url_location_error
...
Fix decode error if pad name contains special characters and is sanitized
2015-10-10 13:21:40 +02:00
webzwo0i
1ee1f818db
if granularity is negative, endNum is negative and loop
2015-10-09 14:55:59 +02:00
webzwo0i
31f7c7e0f2
check if ChangesetRequest granularity is a number ( #2796 )
2015-10-09 14:55:19 +02:00
Stefan
f6cebdad98
Fix decode error if pad name contains special characters and is sanitized
2015-10-08 20:46:15 +02:00
Robin Schneider
29441a8ae1
Get git commit hash even if the repo only points to a bare repo.
...
* Used by https://github.com/debops/ansible-etherpad
2015-10-07 15:43:29 +02:00
Andreas Fried
e6b0e954b5
Fix off-by-one: The chatHead is in fact a valid message index.
...
This fixes #2751 .
2015-09-30 00:48:15 +02:00
Luiza Pagliari
77496b357c
Merge pull request #2777 from storytouch/fix2772
...
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-28 15:28:26 -03:00
Siebrand Mazeland
9c8c3de1d8
Localisation updates from https://translatewiki.net .
2015-09-25 16:07:09 +02:00
Luiza Pagliari
1d134f0b13
Fixing ed52626. It was closing the span with </span data-TAG=VALUE>, not </span>
2015-09-17 15:30:09 -03:00
Stefan
442f2a08f7
Merge pull request #2774 from ether/timeslider-fix
...
Timeslider: Fix "Return to pad" button
2015-09-16 16:07:37 +02:00
Siebrand Mazeland
c215795ab5
Localisation updates from https://translatewiki.net .
2015-09-10 10:30:24 +02:00
Luiza Pagliari
330d2b079d
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-08 11:55:36 -03:00
Luiza Pagliari
ed5262650a
Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VALUE>
2015-09-07 03:55:56 -07:00
Stefan
92798f21e8
Merge pull request #2743 from lpagliari/develop
...
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-09-05 20:53:35 +02:00
Robin Buse
04a26a3e24
Timeslider: Fix "Return to pad" button
...
Closes #2768
2015-09-03 23:04:40 +02:00
Stefan
cc9f88e7ed
Merge pull request #2757 from Gared/doc_append_chat_message
...
Add appendChatMessage API to docs
2015-08-30 18:15:51 +02:00
Luiza Pagliari
1a5985dc75
Accepting Arrays on 'exportHtmlAdditionalTags' to handle attributes stored as ['key', 'value'] (and not only ['key', 'true'])
2015-08-24 07:58:45 -07:00
Stefan
f27aacc5bf
Fix missing bracket
2015-08-15 22:41:59 +02:00
Stefan
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
CodeMichael
68e260783c
Merge pull request #2 from CodeMichael/patch-1
...
allow admin to run on a sub-directory
2015-08-07 08:34:31 -05:00
CodeMichael
6f6de64c4a
allow /admin to run on a sub-directory
2015-08-07 08:31:08 -05:00
CodeMichael
3b08ea6158
allow admin to run on a sub-directory
2015-08-07 08:30:29 -05:00
Stefan
93fd05ba02
Release version 1.5.7
2015-08-05 19:15:27 +02:00
Stefan
856fc5975b
Fix broken switchToPad method
2015-08-05 18:23:54 +02:00
Luiza Pagliari
0677501d0b
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-08-04 07:46:46 -07:00
Thomas Russell Murphy
b557927b72
Fix link to etherpad-lite on GitHub
2015-08-03 21:53:54 -05:00
Olivier Tétard
275a7d31e0
Avoid space removal when pasting text from word processor.
...
Since bf380eea50
2015-07-27 16:38:57 +02:00
Siebrand Mazeland
5c531eebc5
Localisation updates from https://translatewiki.net .
2015-07-23 18:52:24 +02:00
Emily Xie
21f0d12d31
clientReady hook- pass entire message, updated doc
2015-07-20 11:45:41 -04:00
Peter 'Pita' Martischka
31452b2db2
Merge pull request #2721 from lpagliari/develop
...
Complementing #2718 + Fixing empty toolbar when on read-only & menu_left has no button
2015-07-17 21:07:41 +01:00
Siebrand Mazeland
a31e6cd332
Localisation updates from https://translatewiki.net .
2015-07-14 16:22:35 +02:00
Xavid
008d4e653c
Add a aceSelectionChanged hook to allow plugins to react when the cursor
...
location changes.
2015-07-11 11:33:20 -04:00
Siebrand Mazeland
2003968263
Localisation updates from https://translatewiki.net .
2015-07-08 08:18:32 +02:00
Luiza Pagliari
67f4ad5887
Fix editbar height for read-only pads
2015-07-07 16:55:19 -03:00
Luiza Pagliari
8a0a1a65b1
Adding missing code to make toolbar be fixed on top/bottom of the screen for iOS devices.
...
This commit complements 9ccaeb5
2015-07-07 16:54:11 -03:00
Luiza Pagliari
47c4ca9c29
Fixing chat on bottom of the page for mobile devices
2015-07-03 18:38:46 -03:00
Luiza Pagliari
9ccaeb585b
Fixing toolbar on top of the page for mobile devices
2015-07-02 13:03:45 -07:00
Gerhard Großmann
7c0f3a6826
Added Helvetica Neue to the Normal font
2015-07-01 12:13:37 +02:00
Gerhard Großmann
c0f5b92e3d
Added CSS fallback fonts
...
I’m not sure if this is the correct and only place where to change this. I just gave the present fonts some fallbacks (when possible) but didn’t add, remove or merge fonts.
2015-07-01 10:42:33 +02:00
Xavid
ad137fa4c8
Restore newline-adding to setText() if passed string does not end in '\n'.
...
Add a test for the ending-in-'\n' case and update tests for the other case.
2015-06-30 04:47:55 -04:00
John McLear
90575064a9
aria-labels for everything
2015-06-28 17:14:37 +01:00
Clark Boylan
1060595676
Check for valid session in handleUserInfoUpdate
...
Address issue 2674 by checking that the session is valid and has a valid
author and padId before using it to update the userInfo for that
session. Otherwise it is possible that by the time we try to update a
session with new userInfo that session has disconnected and is no longer
available to be updated. Without this commit the etherpad-lite service
gracefully shutsdown whenever this happens.
2015-06-24 15:18:35 -07:00
Luiza Pagliari
6ed85b8787
Fixing @font-face src path to be able to use font icons on plugins when minify is on.
...
This is a commit similar to 56ce8e8
2015-06-24 14:32:10 -03:00
John McLear
6b40961fc8
Merge pull request #2699 from xavidotron/develop
...
Add author information to the context for padCreate and padUpdate hooks.
2015-06-22 10:56:56 +01:00
Siebrand Mazeland
13fa863f4b
Localisation updates from https://translatewiki.net .
2015-06-22 11:52:20 +02:00
Xavid
a4fe0d0dc8
Add an 'author' entry to the context for the padCreate and padUpdate hooks.
2015-06-21 11:29:17 -04:00
Xavid
778e1e4641
Allow a return keypress in a list on the last line of a pad to create a new
...
line.
2015-06-19 14:03:22 -04:00
Xavid
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
Siebrand Mazeland
ef5e62e3a1
Localisation updates from https://translatewiki.net .
2015-06-18 13:25:28 +02:00
goldquest
32ba48835a
if variable not declared, test if null throws error
2015-06-17 18:54:19 +02:00
Luiza Pagliari
1353c093db
Add new icon to fontawesome subset: comment
2015-06-10 18:05:24 -03:00
John McLear
5a5d245c06
fix issues with redrawing focus back to input element would lose param selected name
2015-06-08 17:13:46 +01:00
Siebrand Mazeland
2fa2dc8a03
Localisation updates from https://translatewiki.net .
2015-06-08 16:09:38 +02:00
John McLear
b049f4bfc7
Merge pull request #2681 from lpagliari/develop
...
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 22:07:05 +01:00
Siebrand Mazeland
7e38e2c2b1
Localisation updates from https://translatewiki.net .
2015-05-25 13:00:34 +02:00
Luiza Pagliari
92aabe12dc
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 07:08:24 -03:00
Stéphane Alnet
0b3216ecb6
Do not extend Array.prototype
2015-05-22 12:27:08 +02:00
John McLear
757ad765d3
use removeItem instead of remove namespace
2015-05-22 11:09:21 +01:00
John McLear
0eb8b800cf
hide chat if its already open on readonly mode
2015-05-20 01:50:37 +01:00
John McLear
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
John McLear
fe7ab21c84
dont allow chat input or name input on read only pads
2015-05-19 17:52:43 +01:00
John McLear
818408cf49
other bits required for read only
2015-05-19 16:57:53 +01:00
John McLear
41d24a8c8f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-19 16:44:57 +01:00
John McLear
b662d5c618
dont show editing buttons in R/O view
2015-05-19 16:43:19 +01:00
John McLear
5615bab0d9
Merge pull request #2668 from simong/tidy
...
Tidy HTML before trying to convert it with abiword
2015-05-18 20:04:15 +01:00
Simon Gaeremynck
7fe99cccad
Using log4js in TidyHtml
2015-05-18 17:43:46 +01:00
Simon Gaeremynck
786b43efc8
Tidy HTML before trying to convert it with abiword
2015-05-18 16:24:41 +01:00
Siebrand Mazeland
0c4b3f8124
Localisation updates from https://translatewiki.net .
2015-05-16 18:53:23 +02:00
John McLear
9e9207d8b6
Merge pull request #2657 from simong/cookie-parser
...
Use the cookie parser middleware
2015-05-11 15:10:45 +01:00
John McLear
3b91b46baa
always hide connected one second after connected
2015-05-10 11:46:49 +01:00
John McLear
f5ccd3ce6d
Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix
...
Bugfix innerText
2015-05-07 23:09:24 +01:00
Simon Gaeremynck
5a7750781b
Use the cookie parser middleware
2015-05-07 18:35:21 +01:00
John McLear
debca84ebe
Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys
2015-05-07 15:56:01 +00:00
John McLear
975bd99064
support for french stuff
2015-05-07 15:55:52 +00:00
Stefan Mintert
250afd0451
Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blob/WR-72-linebreak-cursorverhalten/static/hooks.js#L94
2015-05-07 16:47:14 +02:00
John McLear
ee0368fd0f
Merge pull request #2649 from xavidotron/develop
...
When using setText(), replace the entire existing text of the pad.
2015-05-06 16:37:07 +01:00
Xavid
9e86fb279b
Fix backend tests with new setText() implementation; tests depended
...
on the old setText() behavior leaving the last character.
2015-05-06 08:45:22 -04:00
John McLear
361807e578
console msg should go to window
2015-05-06 00:36:42 +01:00
John McLear
c903cb3925
fix alt c and escape
2015-05-06 00:32:36 +01:00
John McLear
363d5d06b7
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-05 20:41:58 +01:00
John McLear
48c2b7cde1
fixes #2570
2015-05-05 20:41:40 +01:00
Xavid
5e64c292a4
When using setText(), replace the entire existing text of the pad,
...
rather than replacing all except the last letter.
2015-05-05 14:18:27 -04:00
0ip
9b85b8dc98
Fix popup border
2015-05-04 22:18:34 +02:00
Siebrand Mazeland
8967c3ea49
Localisation updates from https://translatewiki.net .
2015-05-04 10:39:03 +02:00
John McLear
0a9c631410
better fix for #2625
2015-05-01 20:44:36 +01:00
John McLear
4938c7be38
plugins always return html so use that endpoint
2015-04-29 20:54:41 +01:00
John McLear
da06ac6fd7
dont prompt twice on import fool
2015-04-29 16:40:29 +01:00
Alexander Sulfrian
74ad7a8584
timeslider: Fix export links
...
Names of the pads can contain more charaters than \w. So while
transforming the export links, we simply can allow all charaters
except the slash as pad names.
2015-04-29 16:39:40 +02:00
John McLear
ac41d150c0
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-04-28 23:42:11 +01:00
John McLear
1f471b0f81
show versions of plugins at startup, fixes #2642
2015-04-28 23:41:55 +01:00
John McLear
799b086216
Merge pull request #2641 from lpagliari/develop
...
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 23:05:39 +01:00
John McLear
dbb2956d2f
allow chrome to use control shift 1 to send ordered list
2015-04-28 15:48:12 +01:00
Luiza Pagliari
58ab17bf9e
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 05:31:07 -07:00
John McLear
254edffa9c
fixes #2547
2015-04-24 14:17:49 +01:00
John McLear
b349a4f226
probably fixes #2625
2015-04-23 17:49:08 +01:00
Andreas Åkre Solberg
ec7b3fc787
Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs
2015-04-22 20:29:19 +02:00
John McLear
b8192fd015
first attempt at fixing dead keys, it cant be this easy can it?
2015-04-17 17:01:15 +01:00
Stefan
2393ea01f0
Release version 1.5.6
2015-04-16 23:06:24 +02:00
Tom Hunkapiller
6ff7d4e9a6
revert to old path handling, but strip out "..". fixes #2614
2015-04-15 14:31:21 -05:00
Stefan
64d94cb346
Release version 1.5.5
2015-04-13 17:27:14 +02:00
John McLear
629f909d57
add some semicoolons to prevent chrome warning
2015-04-13 10:52:15 +01:00
louis
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
John McLear
6a027d88a9
fix older IEs
2015-04-12 13:00:01 +01:00
John McLear
5435063a2f
re-fix rtl
2015-04-12 10:35:24 +01:00
John McLear
e3f95d0c9c
Merge pull request #2604 from ether/pad-options
...
session key is now ignored and also padOptions are available in settings
2015-04-11 22:33:46 +01:00
Peter 'Pita' Martischka
fc0cac0cad
merge object settings into default settings
2015-04-11 22:01:46 +01:00
John McLear
8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
John McLear
4a70837de9
Merge pull request #2602 from devoidfury/fix/import-large-etherpad
...
fix large etherpad import, fixes #2524
2015-04-11 20:09:01 +01:00
Stefan
43687f6e8b
Merge pull request #2601 from Gared/session_key_file
...
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 19:10:18 +02:00
Tom Hunkapiller
a896d67e8c
make setPadRaw async; streamline .etherpad file import handling chain
2015-04-11 12:02:19 -05:00
Stefan
a3ed82ad06
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 18:45:14 +02:00
John McLear
25092fcb90
Merge pull request #2600 from devoidfury/fix/junk-binary-files
...
fix: only match /javascript/* for caching middleware
2015-04-11 16:00:02 +01:00
Tom Hunkapiller
133188320a
fix: only match /javascript/* for caching middleware
2015-04-11 09:54:40 -05:00
John McLear
5ef22e649b
Merge pull request #2302 from Gared/create_pad_special_characters
...
Add check for special url characters to createPad API function
2015-04-11 14:56:26 +01:00
John McLear
27aa71f3a4
IE list fixes
2015-04-11 13:16:45 +01:00
John McLear
34c5441392
msg to self
2015-04-11 11:37:20 +01:00
John McLear
4d009ba445
bump underscore and require kernel
2015-04-11 11:32:46 +01:00
Stefan
aa0d14c7d7
Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters
2015-04-11 12:10:37 +02:00
John McLear
14fab9f441
FF middle click fix
2015-04-11 10:45:51 +01:00
John McLear
2ca0214661
bump versions outdated
2015-04-11 10:24:50 +01:00
Stefan
a69b2a9cd1
Merge pull request #2596 from ether/master
...
Master
2015-04-11 10:55:26 +02:00
John McLear
acc1a0626a
use latest ejs
2015-04-11 09:53:27 +01:00
Stefan
1b9a51c879
Release version 1.5.4
2015-04-11 10:19:02 +02:00
Tom Hunkapiller
0b0a349081
clearer comments about the path handling behavior
2015-04-11 09:05:51 +01:00
Tom Hunkapiller
5409eb314c
fix an issue in the path handling that allowed directory traversal
2015-04-11 09:05:32 +01:00
Tom Hunkapiller
2e4374c08d
clearer comments about the path handling behavior
2015-04-10 20:19:26 -05:00
Tom Hunkapiller
3ebb19d8a2
fix an issue in the path handling that allowed directory traversal
2015-04-10 20:03:00 -05:00
John McLear
402e53d88e
Merge pull request #2584 from devoidfury/express4
...
Express 4 support
2015-04-11 00:13:45 +01:00
Stefan
d47e201232
Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3
2015-04-11 00:49:26 +02:00
Stefan
d3277deafc
Increase etherpad version to 1.5.3
2015-04-11 00:32:18 +02:00
Stefan
db5bdc8719
Log version number and git-sha on server start
2015-04-11 00:13:04 +02:00
Stefan
8e4c961207
Add version number to plugins-info page
2015-04-10 23:52:17 +02:00
John McLear
9d4e5f6e35
dont allow directory traversal
2015-04-10 22:02:22 +01:00
Tom Hunkapiller
fd1d285a77
fix the rest of the deprecation warnings
2015-04-10 14:18:30 -05:00
Tom Hunkapiller
6fad2ca39a
fix vulnerability
2015-04-10 06:16:17 -05:00
Tom Hunkapiller
de67714cf8
fix minify route path; update deprecated calls
2015-04-10 05:52:58 -05:00
Tom Hunkapiller
d0b39c01fb
update for express 4.x
2015-04-08 23:12:11 -05:00
John McLear
7b86eb09bc
new fix for #1766
2015-04-08 09:24:19 +01:00
John McLear
a5345524e1
Merge pull request #2566 from ether/editbar-accessibility
...
Accessibility
2015-04-07 21:25:27 +01:00
John McLear
a2e6a1bb4f
Merge pull request #2579 from ether/warnings-in-pad-contents
...
pass error messages to pad text if shown during startup
2015-04-07 21:24:47 +01:00
John McLear
7e99724fec
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-06 13:19:42 +01:00
John McLear
a5aa58e28b
bump ueber
2015-04-06 13:18:44 +01:00
John McLear
e0270d0ba8
bump vs
2015-04-06 13:16:21 +01:00
John McLear
3a969f8dd8
pass error messages to pad text if shown during startup
2015-04-06 00:13:38 +01:00
John McLear
e027083136
timeslider settings for fonts
2015-04-05 15:18:36 +01:00
John McLear
56ce8e80ac
hacky fix for opendyslexic
2015-04-05 14:50:53 +01:00
John McLear
41bb4ef094
support for open dyslexic font
2015-04-05 14:03:09 +01:00
John McLear
e49bb4017c
use ctrl shift 2 instead of alt a
2015-04-05 13:42:26 +01:00
John McLear
db0bcdd696
fix issue where focus on timeslider wouldnt work
2015-04-05 13:39:20 +01:00
John McLear
c65ddad7d6
title for chat
2015-04-03 13:06:03 +01:00
John McLear
9090d76dcf
temp solution for alt 9 to show editbar label
2015-04-03 12:33:31 +01:00
John McLear
f79e2c7de2
final accessibility for Timeslider hopefully
2015-04-03 12:29:47 +01:00
John McLear
139edceb66
Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-02 16:50:43 +01:00
John McLear
85fc012bac
change to alt shit and a to show authors
2015-04-02 15:13:16 +01:00
John McLear
900595355f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-04-02 13:17:01 +01:00
John McLear
644536b27b
fix for #2574
2015-04-02 13:16:49 +01:00
John McLear
ee5833b9c6
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-02 00:05:25 +01:00
John McLear
f6b4b5603d
fix timeslider title issues
2015-04-02 00:03:34 +01:00
John McLear
27ae48686d
reintroduce removed api points that were removed by mistake
2015-04-01 13:56:52 +01:00
John McLear
32a09ff461
tests and fix up sloppy code by original author
2015-04-01 13:52:56 +01:00
John McLear
c705a058fb
Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api
2015-04-01 13:32:07 +01:00
John McLear
fef746e80e
fix import issue with txt files and abiword #2572
2015-04-01 00:19:42 +01:00
John McLear
0b90da19d2
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-03-31 23:32:15 +01:00
John McLear
70fdc7dcd7
Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection
...
Re-implement ace_getAttributeOnSelection
2015-03-31 23:21:49 +01:00
John McLear
b6ff1807da
Merge pull request #2482 from ether/chrome-list-handling
...
chrome list handling fix for #2412
2015-03-31 23:19:47 +01:00
John McLear
b404af7c17
Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition
...
do not crash when encountering mismatched compositions. log the changese...
2015-03-31 23:17:51 +01:00
John McLear
e47992f5b7
Merge pull request #2538 from webzwo0i/check-author-attribution
...
Check author attribution and fix clearAuthorship test
2015-03-31 23:14:22 +01:00
John McLear
64a89a3ec0
Merge pull request #2541 from cristo-rabani/patch-3
...
fixed + support for value
2015-03-31 22:58:10 +01:00
John McLear
4397191f55
Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position
...
feature #2558 get attributes on position
2015-03-31 22:46:00 +01:00
John McLear
e9d8c3b53a
expose method for getting a full user list on the client including historical data
2015-03-31 20:26:55 +01:00
John McLear
64034ee1c6
doh caps
2015-03-31 18:50:50 +01:00
John McLear
48862dac6f
better handling for inputs and left and right arrows
2015-03-31 18:50:20 +01:00
John McLear
37c7c7eabe
i18n for timeslider steppers
2015-03-31 17:06:04 +01:00
John McLear
662216b6cf
slightly different alt stuff
2015-03-31 16:36:44 +01:00
John McLear
498e7f4961
MVP of alt A behavior to show author of line
2015-03-31 16:12:05 +01:00
John McLear
24e6e1728a
I came to bring the rain.. Let me get my coat... Fix focus on timeslider import export
2015-03-31 15:00:43 +01:00
John McLear
73073dcbc1
Timeslider accessibility and Bugfixes
2015-03-31 14:47:00 +01:00
John McLear
0f0a6c73ac
make user list a document so it's easy to navigate by screen readers
2015-03-31 14:11:49 +01:00
John McLear
3126d7196e
fix alt and focus issues
2015-03-31 14:06:02 +01:00
John McLear
ef38bcad9f
make buttons i18n friendly and a better experience
2015-03-31 13:57:18 +01:00
John McLear
35948989b3
make Alt C and Alt F9 and Escape work from anywhere
2015-03-31 13:45:11 +01:00
John McLear
a82e692bdd
dont use nasty settimeouts use a callback instead for focus
2015-03-31 13:21:41 +01:00
Thomas Muehlichen
a930161cb9
feature #2558 added documentation
2015-03-31 10:58:47 +02:00
John McLear
f9071aebe6
fix issue with showControls false not working
2015-03-30 14:56:35 +01:00
Thomas Muehlichen
1c05933dc9
Feature #2567 Added workaround to enable contentcollector to write key-value attributes
2015-03-26 18:49:35 +01:00
John McLear
19e83d5405
much better chat focus toggle behavior
2015-03-26 16:58:13 +00:00
John McLear
428b547d24
alt c to focus on chat and gritter and chat both now work with aria
2015-03-26 16:44:22 +00:00
John McLear
548cef7018
more keyboard support while in editbar
2015-03-26 14:26:21 +00:00
John McLear
6b88c037b8
fix firefox button styling
2015-03-26 14:11:37 +00:00
John McLear
7b726cbc02
more working logic and also pretty nice screen reader experience
2015-03-26 13:58:57 +00:00
John McLear
959aa92656
stop listing URL each time focus is placed back on inner iframe
2015-03-26 13:32:45 +00:00
John McLear
1a5ea8707f
make the pad contents act like an application and not contents, this can probably be togglable but default state should be editable
2015-03-26 13:16:54 +00:00
John McLear
ec1956b4b6
read for button activity
2015-03-26 12:42:07 +00:00
John McLear
4362a42f7f
make index page accessible for screen readers
2015-03-26 11:38:55 +00:00
John McLear
69f0392e75
escape to exit editbar
2015-03-26 11:24:06 +00:00
John McLear
e67ae522e2
support drop down show events
2015-03-25 23:30:17 +00:00
John McLear
aff802a0b3
whoops
2015-03-25 21:15:44 +00:00
John McLear
e9360b6ed2
working f9 logic
2015-03-25 15:49:41 +00:00
John McLear
bc760e9494
logic to send focus back to pad on Alt F9 when focus on editbar
2015-03-25 15:38:19 +00:00
John McLear
0c902ced73
better logic for handling lr arrows
2015-03-25 15:19:52 +00:00
Thomas Muehlichen
fbcbc3c8a2
feature #2558 more precise documentation
2015-03-25 13:29:03 +01:00
John McLear
c6cac53dda
remove console log
2015-03-25 12:25:49 +00:00
John McLear
be73e729d4
remove console log
2015-03-25 12:25:33 +00:00
John McLear
b72127c327
different font families for people with dyslexia
2015-03-25 12:24:20 +00:00
Thomas Muehlichen
e8d85c1173
feature #2558 added functions to get all attributes at the current or an abritrary position
2015-03-25 12:04:10 +01:00
John McLear
5761e998de
first semi working alt f9 functionality
2015-03-25 11:03:45 +00:00
cristo-rabani
ed3ec96838
own list
2015-03-24 20:04:28 +01:00
John McLear
a67664055d
disable cut renumbering of OLs so cut paste works
2015-03-24 09:58:02 +00:00
John McLear
83e6591f1a
temp fix for cut paste but might break some OL functionality
2015-03-24 09:52:17 +00:00
cristo-rabani
382804e44c
fix
2015-03-22 23:14:17 +01:00
Simon Gaeremynck
9bde17b91c
Bumped ueberDB to 0.2.14 so Cassandra suport is included
2015-03-22 12:27:54 +00:00
Thomas Muehlichen
a3f07c1048
fixes #2556 (error toggling line attribute) and clarified method documentation (AttributeManager.toggleAttributeOnLine)
2015-03-20 11:58:56 +01:00
webzwo0i
a0fb65205c
oops, fix export with wildcards
2015-03-14 00:02:23 +01:00
lid2000
7894545556
Return true from handleCut function
2015-03-13 16:01:18 +11:00
Cristo
da1bf00a78
fixed + support for value
2015-03-06 23:02:31 +01:00
John McLear
56dbad41ad
a should always have white space pre-wrap stops caret walking in chrome on them
2015-03-04 17:46:49 +00:00
webzwo0i
f249b42ab4
empty author should be allowed to support clearAuthorship functionality
2015-03-03 16:39:14 +01:00
webzwo0i
0693c0ae97
- operator do not show up in the attribs of a pad, but authors could still leak to the pool
2015-03-03 15:37:56 +01:00
webzwo0i
01cd82427a
check author in = operator
2015-03-03 15:20:33 +01:00
webzwo0i
0f82cd8711
print revision numbers - not changesets - in warn-log
2015-03-02 11:14:24 +01:00
webzwo0i
683c9dfb7c
callback with argument error in async.series instead
2015-03-02 11:05:33 +01:00
John McLear
4e0353b3ef
bump ueber
2015-03-02 08:59:53 +00:00
Chris Ball
063219bbce
Trigger renumbering when deleting (via cut) the first item of a list
...
Fixes #2514 .
2015-02-27 12:54:29 -05:00
John McLear
152f51aeab
Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-count
...
Fixes #1870
2015-02-27 12:03:03 +00:00
webzwo0i
7719117e1e
do not crash when encountering mismatched compositions. log the changesets and padid
2015-02-26 14:57:49 +01:00
John McLear
38a4f1be5f
bump ueberdb
2015-02-26 12:14:01 +00:00
John McLear
178309e10d
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-02-26 12:13:41 +00:00
Luc Didry
92022e493e
Add backend tests for new API functions
...
These new functions are:
* getSavedRevisionsCount
* listSavedRevisions
* saveRevision
+ typo fixing in backend tests
2015-02-25 01:05:58 +01:00
Luc Didry
845788c39d
Add a saveRevision API function
...
Calling saveRevision create an author which name is "API"
2015-02-25 01:04:27 +01:00
Luc Didry
a08c50a77d
Fixes #1870
...
Add two functions to API :
* getSavedRevisionsCount
* listSavedRevisions
2015-02-24 23:42:35 +01:00
John McLear
1c044588e6
mobile stylings for chat always on screen
2015-02-22 17:56:44 +00:00
John McLear
470b0ba2a6
Merge pull request #2520 from ether/load-testing-settings
...
allow for load testing connections to hit by a setting
2015-02-22 14:41:09 +00:00
John McLear
d5bec1701e
fix export of bad pads and also limit import to files
2015-02-21 12:33:30 +00:00
Siebrand Mazeland
abb9b6d833
Localisation updates from https://translatewiki.net .
2015-02-19 13:02:42 +01:00
John McLear
ec6a2b5ba9
allow for load testing connections to hit by a setting
2015-02-16 23:02:19 +00:00
webzwo0i
37924e441a
add try-catch clause around calls to applyToAText
2015-02-16 09:01:30 +01:00
webzwo0i
c9a5167b41
throw in applyToText and not in applyToAText
2015-02-16 06:27:18 +01:00
webzwo0i
59328aa33a
Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of"
...
This reverts commit 66582b19e7
2015-02-16 06:22:49 +01:00
webzwo0i
83e1bf0dc4
add semicolons
2015-02-16 03:33:57 +01:00
webzwo0i
66582b19e7
51c14d9947 changed the return value of
...
applyToText to an array that includes if there was an error in the
newline part of an changeset op.
easysync_tests need to know this too
2015-02-15 16:21:07 +01:00
webzwo0i
440f74b2c1
we do not have the text/padid, but at least we can print the changeset
2015-02-15 15:47:45 +01:00
webzwo0i
b9dd983f81
print the actual text...
2015-02-15 15:27:27 +01:00
webzwo0i
c6ef7f4867
string concat, not multiple arguments...
2015-02-15 15:26:07 +01:00
webzwo0i
1f6a9afae4
better error message
2015-02-15 15:23:43 +01:00
webzwo0i
e7f01fa498
remove unnecessary code; because we have checks in every op now we don't
...
need this anymore
2015-02-15 15:12:24 +01:00
webzwo0i
ac2c7e9679
add newline counting for - and + op
2015-02-15 15:09:38 +01:00
webzwo0i
b4d4b16b1f
off by 1
2015-02-15 14:56:20 +01:00
webzwo0i
4313bd27f8
add a comment to make clear that the string in stringIterator
...
does not change; only curIndex is increased. Newlines are counted
between curIndex and the end of string.
2015-02-15 13:25:57 +01:00
webzwo0i
c191a8716e
totally wrong, introduced by myself in
...
3354b9406b
2015-02-14 16:41:50 +01:00
John McLear
e39b442840
bump v for #2505 fix
2015-02-13 01:25:29 +00:00
John McLear
d0caebc21f
may aswell make the git sha a link to the commit
2015-02-11 18:05:01 +00:00
John McLear
ddc69831b2
working, need to test though
2015-02-11 17:59:05 +00:00
John McLear
275592e423
seems right
2015-02-11 02:07:20 +00:00
John McLear
0ad09c17db
fix JS error in timeslider if offset doesn't exist
2015-02-09 23:04:30 +00:00
John McLear
26ae375727
minor css polish for user input
2015-02-09 19:53:32 +00:00
John McLear
b216f9271b
should be final logic for chatandusers
2015-02-09 19:11:35 +00:00
John McLear
5245d2b797
and even mroe polish
2015-02-09 18:36:11 +00:00
John McLear
8c6507e78c
more styling stuff
2015-02-09 18:01:45 +00:00
John McLear
4af46921e1
better css
2015-02-09 17:37:20 +00:00
Mike DeRosa
4c6bd37286
Adding api call for appending a chat message.
2015-02-09 00:18:12 -05:00
John McLear
7adcd5cba4
cleaner fix for queue issue
2015-02-08 14:34:48 +00:00
John McLear
1652ed42c5
fix scroll issue where focus is not well managed
...
remove console logs
2015-02-07 23:26:02 +00:00
John McLear
b9802616b6
use latest cleanCSS
2015-02-04 17:57:34 +00:00
John McLear
9afcd89167
bump versions to see if it's stable
2015-02-04 17:52:27 +00:00
John McLear
35da64be5c
hrm bit of a hack, anyone any ideas on better way?
2015-01-28 19:09:47 +00:00
John McLear
0216a10a12
better variable name
2015-01-27 20:10:38 +00:00
John McLear
a9910c741e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-27 19:41:09 +00:00
John McLear
bdfce1cbef
change to cc..
2015-01-27 19:41:01 +00:00
John McLear
8fbd7d83b6
content collector should also register the blocks, no idea why this wasnt in before
2015-01-27 19:16:36 +00:00
Siebrand Mazeland
78c3a8d65b
Localisation updates from https://translatewiki.net .
2015-01-26 22:58:30 +01:00
John McLear
b6e7ddf874
bump v
2015-01-26 16:11:15 +00:00
John McLear
4de42da2e3
Merge pull request #2497 from ether/image-support-hook
...
clean support for image hook
2015-01-26 16:07:56 +00:00
John McLear
c4f1189ebd
even cleaner
2015-01-26 02:39:43 +00:00
John McLear
18121a1507
much cleaner
2015-01-26 02:32:58 +00:00
John McLear
8156930208
clean support for image hook
2015-01-26 01:44:40 +00:00
Stefan
4c64b7a670
Revert 'asyncLineHTMLForExport' hook
2015-01-25 22:08:40 +01:00
John McLear
aca745ddf6
tell installer if old etherpad needs updating during plugin install
2015-01-25 02:44:10 +00:00
John McLear
831151cfba
Merge pull request #2487 from ether/html-e-hook
...
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
2015-01-25 00:07:34 +00:00
John McLear
f3e5682a0f
fix issue with load of showuserandchat
2015-01-24 18:31:19 +00:00
John McLear
c798a27ad8
boop
2015-01-24 13:39:45 +00:00
John McLear
3f08bf7405
Merge pull request #2490 from Gared/https_plugins_json
...
Use https to download plugins.json
2015-01-24 13:34:41 +00:00
John McLear
85c5cc80d0
Merge pull request #2488 from webzwo0i/fix-session-without-auth-crash
...
Stop processing a message without auth (i.e. a client did not send
2015-01-24 13:15:58 +00:00
Stefan
da86110f58
Use https to download plugins.json
2015-01-24 12:55:17 +01:00
Stefan
713b369fc3
Add 'last update' column to plugins table
2015-01-24 12:49:17 +01:00
webzwo0i
6b0cf29af6
Stop processing a message without auth (i.e. a client did not send
...
CLIENT_READY)
2015-01-24 06:34:41 +01:00
John McLear
1890ba3976
working, might need polish its pretty late
2015-01-24 05:14:38 +00:00
John McLear
9abb85799c
realization how aCallAll works
2015-01-24 04:31:50 +00:00
John McLear
372063295f
beginning of a hook, needs docs etc
2015-01-24 04:09:13 +00:00
John McLear
5dce72d419
chrome list handling fix for #2412
2015-01-23 01:47:12 +00:00
John McLear
6fd0285d4d
include lineContent in hok
2015-01-21 21:36:11 +00:00
John McLear
036dea3d0f
styling
2015-01-21 17:25:06 +00:00
John McLear
657974b518
move saved revs notification to gritter
2015-01-21 16:40:44 +00:00
John McLear
aee0fd797d
working translation
2015-01-21 16:11:00 +00:00
John McLear
753e8fdf0b
working logic
2015-01-21 16:08:54 +00:00
John McLear
17fa87552d
styling
2015-01-21 15:48:21 +00:00
John McLear
941cc3c24b
url param
2015-01-21 15:37:55 +00:00
John McLear
920ec9c553
Merge pull request #2467 from ether/chat-and-users
...
Show users and Chat at the same time
2015-01-21 15:22:23 +00:00
John McLear
3cd8759cec
expose modernIE value
2015-01-21 15:21:31 +00:00
John McLear
3fd6e72657
try again
2015-01-21 15:06:29 +00:00
John McLear
a2cb8a2f19
rename back to browser
2015-01-21 15:01:39 +00:00
John McLear
7237a3b7cc
bump ueberdb
2015-01-21 14:58:47 +00:00
John McLear
f2891e3b8b
working
2015-01-21 14:55:29 +00:00
John McLear
ce40cacafa
mheh looks fixed
2015-01-21 14:49:06 +00:00
John McLear
990e14c904
working with a big hack
2015-01-21 14:25:24 +00:00
John McLear
34d6b31c98
some sanity
2015-01-21 13:24:21 +00:00
John McLear
eacf1118f8
blind attempt to try
2015-01-21 02:55:03 +00:00
John McLear
cb65224997
better logic for author handling
2015-01-21 00:28:00 +00:00
John McLear
5f9bbd0666
restrict expor4t to only expose this pad ID
2015-01-21 00:03:39 +00:00
John McLear
531d25ab84
freeze deps
2015-01-20 23:50:55 +00:00
John McLear
84638a39b7
Merge pull request #2469 from ether/new-sethtml-tests
...
I need to do some more work on this at some point.. Leaving here
2015-01-19 15:51:37 +00:00
John McLear
c315defc31
temp bodge fix
2015-01-19 15:15:52 +00:00
John McLear
ab71bc7c20
hrm
2015-01-19 14:45:49 +00:00
John McLear
edbeb66d5e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-19 14:33:17 +00:00
John McLear
44d1d6cc13
fix ie editing
2015-01-19 14:32:58 +00:00
John McLear
4ab4c9998b
Merge pull request #2470 from cetra3/timeslider_proxy_fix
...
Timeslider proxy fix
2015-01-19 13:32:03 +00:00
Siebrand Mazeland
28aeeff154
Localisation updates from https://translatewiki.net .
2015-01-19 09:28:03 +01:00
Cetra Free
f1c9c58c2d
Update to timeslider to include base path for easier proxying
2015-01-19 14:28:30 +10:30
Cetra Free
3649118194
Update to timeslider to include base path for easier proxying
2015-01-19 14:25:06 +10:30
John McLear
4f637befeb
more fixing
2015-01-19 02:59:17 +00:00
John McLear
85fffbe14c
more handling
2015-01-19 02:57:10 +00:00
John McLear
cadb83ac5a
bumpage
2015-01-19 02:51:32 +00:00
John McLear
13eff60dfe
mheh I suck at css 0ip would do a way better job of this
2015-01-19 02:13:34 +00:00
John McLear
63c65f784b
semi working example
2015-01-19 01:45:49 +00:00
John McLear
73d6030762
boop
2015-01-19 00:36:12 +00:00
John McLear
33c62329ba
better regexp for line items
2015-01-19 00:28:32 +00:00
John McLear
0bd7914c3b
dont paste on middle click of link
2015-01-18 23:58:47 +00:00
John McLear
6bc74a9adb
more export logic handling
2015-01-18 23:33:29 +00:00
John McLear
e50ea6ffea
whoops proper regexp fix for listNumber
2015-01-18 23:24:20 +00:00
John McLear
bd9ff770fe
reset all numbers on first item
2015-01-18 23:21:34 +00:00
John McLear
ce41bcea2f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-18 23:17:06 +00:00
John McLear
af70902bef
support deeper nested elements on exports
2015-01-18 23:16:58 +00:00
John McLear
7e69bc65ce
remove infinite load was causing pain
2015-01-18 23:03:54 +00:00
John McLear
689ced8443
and this one..
2015-01-18 20:15:17 +00:00
John McLear
c0a4051b7a
use etherpads own yajsml
2015-01-18 20:12:02 +00:00
John McLear
ca6b729ace
fix for ep page view pageup/down
2015-01-18 19:58:38 +00:00
John McLear
83fae22279
allow list text entry up to 16 items
2015-01-18 15:32:48 +00:00
Stefan
3c6db077ed
Change domain for plugins.json request
2015-01-18 14:22:27 +01:00
Stefan
4644073399
Prevent dublicates in search results
2015-01-18 13:56:30 +01:00
Stefan
6d6ddd7f9f
Prevent form submit on plugin page
2015-01-18 12:15:41 +01:00
John McLear
b2616c820e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-12 00:00:07 +00:00
John McLear
a553b44dbc
refix plugins
2015-01-11 23:59:18 +00:00
Stefan
a080b12eac
Add new favicon (32x32) with associated svg file
2015-01-11 22:40:56 +01:00
Timothy Gu
9b9a747167
Support ejs 2.0
...
Fixes #2437 .
This is still relying on undocumented behavior, but should unbreak the app
in the mean time.
2015-01-11 08:17:17 -08:00
Marcel Klehr
167e0aea59
Merge pull request #2442 from ether/fix/attribmanager-removeattribonline
...
Finally fix AttribManager#removeAttributeOnLine
2015-01-10 16:35:37 +01:00
webzwo0i
82efcdb430
fix for uls without class
2015-01-09 02:04:03 +01:00
John McLear
f2c443809f
roll ejs back as its broken at v2
2015-01-07 15:18:54 +00:00
John McLear
17ce67d936
final html export hook
2015-01-06 16:31:52 +00:00
Marcel Klehr
751adb24fd
Finally fix AttribManager#removeAttributeOnLine
...
return safely if the attribute wasn't found.
fixes #2394
2015-01-05 18:38:34 +01:00
John McLear
c0078abc75
Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection
2015-01-05 17:15:38 +00:00
John McLear
26c839063f
check file system that abiword exists
2015-01-04 14:47:08 +00:00
Siebrand Mazeland
e2ea82f8df
Localisation updates from https://translatewiki.net .
2015-01-02 10:58:48 +01:00
John McLear
230302b132
fix timeslider stars and frontend tests, needs css polish
2015-01-01 22:40:45 +00:00
John McLear
45e90e138c
v number bump
2015-01-01 16:57:31 +00:00
Marcel Klehr
1451eecaf0
Re-implement ace_getAttributeOnSelection
2014-12-31 19:23:09 +01:00
John McLear
8eb723b906
patch for e1c683be3f
2014-12-31 14:16:10 +00:00
John McLear
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
John McLear
4b6df17e99
Merge pull request #2421 from webzwo0i/fix-swagger
...
hack to avoid warnings in swagger usage
2014-12-31 13:27:00 +00:00
John McLear
b5c671a9b6
Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs
...
Clean-up after removing list attribute: Remove list numbering attribute
2014-12-31 13:19:24 +00:00
John McLear
335bf3dc4a
more line polish
2014-12-31 01:46:53 +00:00
John McLear
01c667aa2e
export html more styles
2014-12-31 00:53:20 +00:00
webzwo0i
b0da214ad5
hack to avoid warnings in swagger usage
2014-12-30 18:06:41 +01:00
Marcel Klehr
cfe75c7f3f
Clean-up after removing list attribute: Remove list numbering attribute
2014-12-30 17:45:26 +01:00
Stefan
c20a7e9bce
Merge pull request #2406 from Gared/fix/author-not-set-callback
...
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-30 14:55:49 +01:00
Stefan
5df638bfac
Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected
...
Notify user if cookies can't be created
2014-12-30 14:54:43 +01:00
John McLear
90e83ed6b5
more styling
2014-12-30 14:53:44 +01:00
John McLear
716b1c6113
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-30 14:44:55 +01:00
John McLear
16713d8b3b
some demo export loic for handling OL incrementation
2014-12-30 14:43:00 +01:00
John McLear
4687d226c6
Merge pull request #2417 from webzwo0i/fix-export
...
Fix ExportHtml.js list parsing code
2014-12-30 13:47:31 +01:00
John McLear
19c78212e8
Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished
...
Fix lineassembler not finished
2014-12-30 12:19:04 +01:00
John McLear
a07d1722fc
no errors on chrome client
2014-12-30 12:12:24 +01:00
John McLear
5ba3cab445
better take some responsibility
2014-12-30 00:13:01 +01:00
John McLear
ac4f9eb4ce
licensing
2014-12-30 00:12:26 +01:00
John McLear
99a239fa9a
remove console log
2014-12-30 00:10:08 +01:00
John McLear
0676d2fe24
working author import
2014-12-30 00:01:15 +01:00
John McLear
b8648b4a49
remove error logging
2014-12-29 23:08:42 +01:00
John McLear
1e0de620be
more author logic
2014-12-29 23:08:17 +01:00
John McLear
ec2b844f94
authors
2014-12-29 22:51:31 +01:00
John McLear
a2262c56b9
msg for user
2014-12-29 22:05:14 +01:00
John McLear
a6400b3f61
allow only for pads less than 10 to be overwritten
2014-12-29 22:02:24 +01:00
John McLear
ab5e7381a2
working for all files
2014-12-29 21:35:10 +01:00
John McLear
1081156f13
whoopsi, required files
2014-12-29 21:13:49 +01:00
John McLear
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
webzwo0i
6e4e034e42
fix closing of lists
2014-12-29 16:27:40 +01:00
webzwo0i
e1c683be3f
differentiate between indents and bullets in unordered lists
2014-12-29 16:12:07 +01:00
John McLear
302ceb665b
delay write to fix copypad -- bad practice but due to db.set not allowing callback
2014-12-29 14:59:22 +01:00
John McLear
3fe802077c
Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-twice
...
disconnect client if it submits an already accepted changeset based on a...
2014-12-29 02:01:03 +01:00
John McLear
c4959b089f
resolve merge conflict
2014-12-29 01:54:44 +01:00
John McLear
321d550d43
second fix for user list issue on #2413
2014-12-29 01:20:28 +01:00
John McLear
23570e80a7
unbind before rebind, partial fix towards #2413 issue
2014-12-29 01:17:24 +01:00
John McLear
248d7655d7
Merge pull request #2401 from ether/save-prefs
...
set prefs and get prefs
2014-12-29 01:01:09 +01:00
John McLear
8603fb4583
fix sockets of switch to pad
2014-12-29 00:46:47 +01:00
John McLear
6b1fee400d
Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest
2014-12-29 00:40:07 +01:00
Gared
018821e98c
Use camel case
2014-12-28 22:20:09 +01:00
John McLear
74eca43965
Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow
...
Close extended chat window
2014-12-28 20:17:30 +01:00
Gared
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
John McLear
68f50ff9fa
Merge pull request #2409 from ether/fix-removeAttribOnLine
...
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
2014-12-28 12:52:39 +01:00
Marcel Klehr
362315c638
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
2014-12-28 12:34:42 +01:00
webzwo0i
6ca2c91fdf
close and open lists according to the actual line.listLevel
2014-12-28 02:32:53 +01:00
webzwo0i
d71b11f4b2
fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested
2014-12-28 02:31:26 +01:00
John McLear
dd09f6144b
Merge pull request #2398 from ether/indentLevels
...
Indent levels
2014-12-27 23:27:11 +01:00
John McLear
c276343216
timeslider fixes
2014-12-27 22:31:23 +01:00
Gared
9cf19b99fe
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-27 22:25:24 +01:00
John McLear
b1f29b914c
minor ts bg fix
2014-12-27 22:05:35 +01:00
webzwo0i
3354b9406b
op is ok, if it doesnt include newlines. op is ok, if op.lines is equal to newlines in op.chars
2014-12-27 19:30:02 +01:00
webzwo0i
51c14d9947
check if op.lines is in sync with atext-newlines
...
Conflicts:
src/static/js/Changeset.js
2014-12-27 19:28:56 +01:00
webzwo0i
251a75346d
make stringIterator aware of newlines
2014-12-27 19:25:14 +01:00
John McLear
036df30c0e
Merge pull request #2402 from ether/fix-attribmanager-removeLineAttrib
...
Fix removeAttributeOnLine: Only remove a single attrib
2014-12-27 19:23:49 +01:00
John McLear
7df944b3fd
Merge pull request #2404 from webzwo0i/sanity-in-atext
...
block changeset if it deletes more lines than exist in the whole pad
2014-12-27 18:36:13 +01:00
Siebrand Mazeland
ddd6a8ebce
Localisation updates from https://translatewiki.net .
2014-12-27 17:59:55 +01:00
webzwo0i
07a6702363
Revert "be more strict in checkRep"
...
This reverts commit 22803da42f
2014-12-27 17:56:20 +01:00
Stefan
a645aeef5c
Merge pull request #2400 from Gared/fix/author-not-set
...
Prevent server crash if author is not set
2014-12-27 16:15:26 +01:00
Marcel Klehr
a63880dcb1
Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib
2014-12-27 16:15:20 +01:00
John McLear
a151c207c2
set prefs and get prefs
2014-12-27 15:08:54 +01:00
Gared
40c7ee9df9
Prevent server crash if author is not set
2014-12-27 14:26:05 +01:00
John McLear
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
John McLear
6ac99ab03f
support for export
2014-12-27 13:27:07 +01:00
John McLear
9d66a446dc
support indentation up to 16 levels and dont go back afterwards
2014-12-27 13:18:58 +01:00
John McLear
10d92b6bf1
slightly better attribute selection logic but still pretty b0rked
2014-12-26 23:42:00 +00:00
John McLear
88ab74b1e9
fix flowing of items in editbar
2014-12-24 17:54:13 +00:00
John McLear
b71fb3ad20
fix issue with attributes
2014-12-23 02:38:50 +00:00
John McLear
fdc930de3d
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:43:21 +00:00
John McLear
ee3f3b8060
move clean css back to fix minification on TS
2014-12-21 23:42:56 +00:00
John McLear
4573796166
fix
2014-12-21 23:16:23 +00:00
John McLear
3fe58068c0
more fixes
2014-12-21 23:16:00 +00:00
John McLear
12aac2d0d0
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:12:59 +00:00
John McLear
745ef5db1c
fix timeslider socket issue
2014-12-21 23:10:56 +00:00
webzwo0i
69bad8b30c
fix typo in addSavedRevisions
2014-12-17 01:10:20 +01:00
webzwo0i
b204aa2085
remove more dead requires.
2014-12-16 19:10:01 +01:00
John McLear
a2d22a5764
Merge pull request #2377 from webzwo0i/avoid-global-vairables
...
declare var outside of loop
2014-12-16 16:18:01 +00:00
webzwo0i
0263d30b37
declare var outside of loop
2014-12-16 17:00:35 +01:00
John McLear
cfa3f15f94
Merge pull request #2373 from webzwo0i/avoid-global-vairables
...
dont make local variables global
2014-12-16 00:41:41 +00:00
webzwo0i
5d15f655f0
dont make local variables global
2014-12-14 22:01:28 +01:00
John McLear
a2dbf8761f
allow for timeslider custom messages
2014-12-10 01:23:24 +00:00
John McLear
197a41627d
allow plugins to add multiple styles
2014-12-09 17:34:52 +00:00
John McLear
3a2669b704
additional tag support hook
2014-12-09 16:13:52 +00:00
Simon Gaeremynck
45c1ad078b
Allow for shardable Etherpad
2014-12-09 14:59:18 +00:00
John McLear
653cc6c87f
this class was in before, it is used to show when a style is applied to a piece of content
2014-12-09 14:57:18 +00:00
John McLear
f11bdc1b44
also logic to add attributes for properties
2014-12-09 01:31:40 +00:00
John McLear
f2c155ee1a
blah use async
2014-12-08 19:44:40 +00:00
John McLear
7cf0e4a9ae
allow padId to be passed into the hook
2014-12-08 19:11:45 +00:00
John McLear
2218cbd252
docs
2014-12-08 19:08:12 +00:00
John McLear
6080de9d79
Merge pull request #2348 from ether/sanitizer
...
sanitizer change
2014-12-04 17:31:42 +00:00
webzwo0i
22803da42f
be more strict in checkRep
2014-12-04 16:12:13 +01:00
webzwo0i
5306f0c98a
wrap appendRevision in try-catch block
2014-12-04 16:05:02 +01:00
webzwo0i
10c2f72720
dont remove more lines than exist in the whole text
2014-12-04 16:01:39 +01:00
John McLear
c1fdd7ff79
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-01 15:10:17 +00:00
John McLear
c539cc7d6b
styling of global view colum
2014-12-01 15:10:03 +00:00
John McLear
b5a0767f32
Merge pull request #2350 from ether/require-kernel-change
...
Require kernel change
2014-11-30 23:30:00 +00:00
John McLear
6fea3a25f8
stop death on no session
2014-11-30 21:21:58 +00:00
John McLear
e9686c0d93
Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change
2014-11-29 03:08:42 +00:00
John McLear
d7e980cd47
yet more minor css polish
2014-11-29 02:24:19 +00:00
John McLear
12f25d8a45
bump cleancss
2014-11-29 01:31:04 +00:00
John McLear
607c2119a9
Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change
2014-11-29 00:56:18 +00:00
John McLear
ed96c13a1f
minor ui polish
2014-11-29 00:54:06 +00:00
John McLear
ee585f0457
color picker on mobile actually shows on screen
2014-11-29 00:32:37 +00:00
John McLear
34f7625739
a little more polish
2014-11-29 00:30:13 +00:00
John McLear
53887db872
mobile ui polish
2014-11-29 00:26:25 +00:00
John McLear
74ffbdea79
bump vs
2014-11-28 18:02:11 +00:00
John McLear
3224122f7e
correct kernel v#
2014-11-28 17:47:55 +00:00
John McLear
3bf9f3cf1d
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 17:43:01 +00:00
John McLear
a642deaa72
gritter css fix
2014-11-28 02:25:21 +00:00
John McLear
68979e1212
better fix
2014-11-28 00:35:46 +00:00
John McLear
e6d85bbe69
fix issue with top of chatbox not being aligned properly
2014-11-28 00:26:34 +00:00
John McLear
edc5669fa6
Merge pull request #2344 from ether/backend-tests
...
Backend tests
2014-11-28 00:04:12 +00:00
John McLear
d974e881a8
Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer
2014-11-28 00:02:16 +00:00
John McLear
422cfec27a
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 00:01:47 +00:00
John McLear
3ca48ed975
fix undo in chrome etc
2014-11-27 16:49:08 +00:00
John McLear
c13301966f
yeah need htis too
2014-11-27 02:56:42 +00:00
John McLear
61c6deda2e
use a forked require-kernel
2014-11-27 02:44:48 +00:00
John McLear
2c728b8e1b
sanitizer change
2014-11-27 00:45:22 +00:00
John McLear
e51ab2db24
fix for #2132
2014-11-26 23:37:44 +00:00
John McLear
cff8f4a61e
remember to add supertest
2014-11-26 21:58:27 +00:00
John McLear
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
John McLear
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
John McLear
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
John McLear
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
John McLear
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
John McLear
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
John McLear
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
John McLear
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
luto
5c3874c0a1
really recreate socketio-client in expressCreateServer, fixes #2342
...
When using plugins, the express server gets restarted. When we do that,
the socketio-server should also get restarted. It doesn't. That means
that all the events in SocketIORouter.js are bound twice, which causes
chaos all over etherpad.
This changes our socketio.js so it fully recreates the io-instance when
we restart the server.
introduced in 95e7b0f156
2014-11-25 22:38:22 +01:00
John McLear
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
John McLear
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
John McLear
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00
John McLear
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
John McLear
555d22245d
Merge pull request #2335 from ether/javascript-bower
...
swap out jquery browser for bower but expose browser object to all pages...
2014-11-23 14:15:41 +00:00
John McLear
73bcbbcb89
final commit
2014-11-23 14:15:03 +00:00
John McLear
0eb7cc7864
Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc
2014-11-23 14:14:11 +00:00
John McLear
ae7da122d7
fix session management
2014-11-23 14:14:01 +00:00
John McLear
5f2e830b72
whoopsi
2014-11-22 19:13:23 +00:00
John McLear
9b66c93d6b
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
2014-11-22 19:11:35 +00:00
John McLear
764b8af5e3
Merge pull request #2334 from luto/api-mystery-crash
...
fix api mystery crash
2014-11-22 15:50:23 +00:00
luto
4eee89ad12
fix api mystery crash
2014-11-22 16:46:37 +01:00
l-y-n-x
4e31ec8ab9
Changed relative path to Etherpad main page in admin settings.
...
There was one '../' too much.
2014-11-22 10:24:30 +01:00
John McLear
488d6890f9
minor styling
2014-11-21 00:15:55 +00:00
John McLear
703440acd7
missing socketio fix
2014-11-21 00:11:50 +00:00
John McLear
ff9a2a687f
whoops fix animation not to look broken
2014-11-19 18:27:55 +00:00
John McLear
28c7b666c1
correct file links
2014-11-19 00:24:14 +00:00
John McLear
16d8068d7d
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
2014-11-19 00:17:01 +00:00
John McLear
9aea689438
move tiny bit of font awesome we actually use into pad.css
2014-11-19 00:16:08 +00:00
John McLear
0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
John McLear
f5dcc374ba
slight ui fix
2014-11-18 23:15:56 +00:00
John McLear
e821cb13fa
more polish
2014-11-18 22:47:20 +00:00
John McLear
95cb721914
clean up
2014-11-18 22:41:00 +00:00
John McLear
09b08e5a72
working pause
2014-11-18 22:29:46 +00:00
John McLear
e2410e41b0
more polish
2014-11-18 22:24:16 +00:00
John McLear
a06f01c04a
some timeslider styling but this wont be completed by me
2014-11-18 22:21:36 +00:00
Beau Gunderson
645ec830b0
Don't crash on bad plugins.json; fixes #2323
2014-11-18 13:59:36 -08:00
John McLear
0bea3a3af6
no image on timeslider
2014-11-18 21:13:21 +00:00
John McLear
4a12eec3e0
a font lookup file
2014-11-18 21:10:40 +00:00
John McLear
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +00:00
John McLear
9b5ee93bce
spinning loading icons
2014-11-18 19:13:51 +00:00
John McLear
3ad9a58895
fontello config file
2014-11-18 18:47:12 +00:00
John McLear
21ce9b4dd3
correct font stuff
2014-11-18 18:44:45 +00:00
John McLear
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
John McLear
3e8f3cd938
hrm I dont trust this security
2014-11-18 14:56:40 +00:00
John McLear
ff603d7b58
stability restored now to handle the auth issues
2014-11-18 14:12:02 +00:00
John McLear
d10013c159
client side code now fixed
2014-11-18 14:10:38 +00:00
John McLear
020b636b1f
template of a semi-fix
2014-11-18 14:08:44 +00:00
Marcel Klehr
135aa3e8fe
Merge pull request #1783 from simong/removed-console-in-html10n
...
Removed console wrapping in html10n as it's breaking in PhantomJS.
2014-11-15 18:08:53 +01:00
Simon Gaeremynck
d7a181be67
Nooping console.foo in html10n.js when the method is not defined.
2014-11-15 16:31:19 +00:00
John McLear
865829e159
Merge pull request #1682 from luto/fix-listSessionsOfGroup
...
Don't error in listSessionsOfGroup when there are non-existing sessions
2014-11-15 16:25:23 +00:00
John McLear
fc79c8a298
Merge pull request #1912 from ether/hide-chat-when-caret-behind
...
Hide Chat Icon when the Caret is on the same line
2014-11-15 16:13:53 +00:00
John McLear
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
John McLear
4986dd11ee
merging
2014-11-15 15:39:46 +00:00
John McLear
eff4863a22
Merge pull request #2290 from ether/IE11-null-password
...
change to proper IE check
2014-11-15 15:37:53 +00:00
John McLear
12914e68ff
Merge pull request #2294 from ether/go-away-npm
...
Use request and a remote ep plugin only endpoint
2014-11-15 15:37:44 +00:00
John McLear
8d2fa35b3f
Merge pull request #2298 from ether/reflow-toolbar-properly
...
Reflow toolbar properly
2014-11-15 15:37:28 +00:00
John McLear
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
John McLear
a75f02cddf
Merge pull request #2300 from cristo-rabani/patch-1
...
Added option to restore revisions #1791
2014-11-15 15:32:24 +00:00
Siebrand Mazeland
e8fda27ead
Localisation updates from https://translatewiki.net .
2014-11-14 13:42:39 +01:00
John McLear
a52743d8f1
Merge pull request #2282 from ether/chrome-paste
...
Chrome browser change wrapping type
2014-11-13 13:00:32 +00:00
John McLear
e5d77c3763
indentation
2014-11-12 21:39:03 +00:00
Cristo
0253156dbb
Update APIHandler.js
2014-11-12 19:55:37 +01:00
Cristo
f7dd756642
Update API.js
2014-11-12 19:53:56 +01:00
Cristo
f59238fe58
Update API.js
2014-11-12 19:50:43 +01:00
Cristo
24ac082cae
Update API.js
2014-11-12 19:49:08 +01:00
Cristo
9d39c9591a
update pad clients
2014-11-12 19:46:50 +01:00
John McLear
07d29a5d7a
Merge pull request #2219 from Gared/fix_css
...
Fix position of import/export popup in timeslider
2014-11-12 15:18:25 +00:00
Prateek Saxena
60b698f69b
Add keyboard shortcut for "Clear Authorshop Colors" in en locale
...
Translate wiki should pick this up and the translations will
start coming in a while. #2292
2014-11-09 09:18:50 +05:30
Stefan
573a912e4f
Add check for special url characters to createPad API function
2014-11-08 17:26:40 +01:00
Cristo
46bc328896
new api ver
2014-11-08 01:41:23 +01:00
Cristo
c33c6e085e
comment addded
2014-11-08 01:39:27 +01:00
Cristo
d246a191c6
Added option to restore revisions #1791
2014-11-08 01:12:40 +01:00
Prateek Saxena
2d597a4cab
Add keyboard shortcut to Clear Authorship Colors. Fixes #2292
2014-11-07 14:01:32 +05:30
John McLear
fc5152c2f3
remove logging
2014-11-06 17:38:38 +00:00
John McLear
3eb0652b21
fix pg
2014-11-06 16:38:31 +00:00
John McLear
d13b6162f0
this looks way better
2014-11-06 15:50:55 +00:00
John McLear
0685e563ed
working on resize
2014-11-06 15:43:21 +00:00
John McLear
96d6e7c1b7
cleaner reflow
2014-11-06 15:12:40 +00:00
John McLear
9170effb27
working redraw and draw on startup
2014-11-06 15:09:44 +00:00
John McLear
7d04d7309f
reflow buttons based on browser size, much better
2014-11-06 14:32:20 +00:00
John McLear
57f56d8fe1
bump express to a working version
2014-11-04 23:42:40 +00:00
John McLear
053ff3097d
whoops I missed this one
2014-11-04 23:29:45 +00:00
John McLear
9fa77cdea2
working handling of setting client ip and anonymizing etc
2014-11-04 23:25:18 +00:00
John McLear
f418dfa205
fix author notification handler
2014-11-04 22:37:10 +00:00
John McLear
af3e8e5e15
fix room client leave
2014-11-04 22:34:43 +00:00
John McLear
8391f902fb
re-apply roomsize
2014-11-04 22:31:09 +00:00
John McLear
a6cbb4af40
working messages
2014-11-04 19:58:38 +00:00
John McLear
68eaa09708
Begin to repair damage done to rooms logic
2014-11-04 19:55:05 +00:00
John McLear
95e7b0f156
transports
2014-11-04 19:11:06 +00:00
John McLear
cb28d10963
move logging into debug environment variable .. sighs
2014-11-04 18:32:26 +00:00
John McLear
5d0ccb5f8f
auth fix
2014-11-04 18:17:39 +00:00
John McLear
adef0af227
more stuff required to stop it crashing, now we have identified what needs fixing we can fix it
2014-11-04 18:01:41 +00:00
John McLear
1e53c4f5f0
identify which parts are causing issues and comment them out, obviously this needs fixing
2014-11-04 17:57:18 +00:00
John McLear
c7061e47db
use request and a remote ep plugin only endpoint
2014-11-04 17:06:47 +00:00
John McLear
b59f6a4d6f
Update ace2_inner.js
2014-11-04 15:50:53 +00:00
John McLear
b61d8d99d1
Update package.json
2014-11-03 17:15:22 +00:00
John McLear
2c801cc558
no errors but no connections
2014-11-01 22:36:19 +00:00
John McLear
a67e805da0
basics, still not working
2014-11-01 21:25:49 +00:00
John McLear
124ae31137
blah push back for imports
2014-11-01 21:15:31 +00:00
John McLear
1530757d8e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 21:12:53 +00:00
John McLear
ff549db261
use latest jsdom
2014-11-01 20:58:56 +00:00
John McLear
a22b558a2c
change to proper IE check
2014-11-01 20:21:48 +00:00
John McLear
9b8398d0bd
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 20:20:19 +00:00
John McLear
d54bb52b75
Fixes #1414
...
https://github.com/ether/etherpad-lite/issues/1414
2014-11-01 18:18:25 +00:00
John McLear
bf380eea50
take line breaks and treat them appropriatly instead of creating a space for them..
2014-11-01 18:07:34 +00:00
John McLear
4b488bc8af
Merge pull request #2116 from jdittrich/updateUnderscore
...
Underscore Version: Update package.json
2014-11-01 16:37:00 +00:00
John McLear
41b7f99204
Bump resolve
...
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
2014-11-01 16:25:14 +00:00
John McLear
51b9af9df0
bump ueberdb again
2014-10-30 16:12:17 +00:00
John McLear
cd8ea040ad
bump ueber to require working mysql
2014-10-30 14:41:21 +00:00
John McLear
f104644297
Fix for MySQL issues
...
See https://github.com/Pita/ueberDB/issues/63
2014-10-29 12:15:53 +00:00
Siebrand Mazeland
45611561e6
Localisation updates from https://translatewiki.net .
2014-10-27 18:53:33 +01:00
John McLear
ac2e949c3e
chrome browser change wrapping type
2014-10-24 00:13:34 +01:00
Siebrand Mazeland
3fce9f8309
Localisation updates from https://translatewiki.net .
2014-10-23 21:32:44 +02:00
Siebrand Mazeland
086bf83e6c
Localisation updates from https://translatewiki.net .
2014-10-20 18:57:22 +02:00
John McLear
226e0bf0e3
bump resolve
2014-10-14 14:41:18 +01:00
John McLear
9c2f8808be
bump swagger
2014-10-14 14:38:47 +01:00
John McLear
09acdda4f7
bump semver
2014-10-14 14:37:57 +01:00
Prateek Saxena
6f5f89bc6b
Use 'evt.shiftKey' instead of matching 'charCodes'
...
The shortcut wasn't running consistently and was blocking
'Cmd+L' on Chrome 38. Instead of going to the location bar
it would tooggle the list. Strangely, it did not override
'Cmd+N'. Using `evt.shiftKey` instead of matching the `charCode`
to the uppercase letter solves the problem.
2014-10-14 18:37:35 +05:30
Prateek Saxena
8af34a2295
Replace "-" with "+" in tooltips with keyboard shortcuts
...
Ctrl-Shift-L seems counter intuitive as you have to press
the keys together.
2014-10-14 18:14:47 +05:30
John McLear
aee652dafc
Merge pull request #2269 from prtksxna/fonticons
...
Add a subset of FontAwesome icons using Fontello
2014-10-14 13:29:41 +01:00
John McLear
b62c82575f
Merge pull request #2264 from prtksxna/a-span-title
...
Move `title` attribute of buttons from `<span>` to `<a>`
2014-10-14 13:29:00 +01:00
Prateek Saxena
ca32ac89b6
Add a subset of FontAwesome icons using Fontello
...
Most of the code here has been taken from @LaKing's #2554 .
Only icons required for etherpad have been added. Here is a
list of the code points that are being used:
0xe800 0xe801 0xe802 0xe803
0xe804 0xe805 0xe806 0xe807
0xe808 0xe809 0xe80a 0xe80b
0xe80c 0xe80d 0xe80e 0xe80f
0xe810 0xe811 0xe812 0xe813
0xe814 0xe815 0xe816 0xe817
Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css
Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.
This is the first step for #2253
2014-10-14 09:16:44 +05:30
Prateek Saxena
7b8953ee75
Add keyboard shortcuts for ordered and unordered lists and update tooltips #1987
...
Ordered List: Ctrl-Shift-N
Unordered List: Ctrl-Shift-L
2014-10-12 17:40:57 +05:30
Prateek Saxena
001d75cd1e
Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987
...
A quick search revealed that 'Ctrl-5' is a popular shortcut
for strikethrough. Implemented in 'ace2_inner' and updated
the English l10n file for the tooltip.
2014-10-11 22:51:20 +05:30
Prateek Saxena
437b2bfc64
Move title attribute of buttons from <span> to <a>
...
The `.toolbar ul li a` that holds the `span.button` has a
padding of `4px 5px`. This means if the mouse is on the edge
of the button the `:hover` state is active but the relevant
tooltip does not show up. Moving the `title` attribute to
the `<a>` itself solves this problem.
Also removed some extra whitespace.
2014-10-11 20:22:31 +05:30
John McLear
0962f65c08
I prefer this..
2014-10-06 14:23:13 +01:00
John McLear
f0c12d3884
escape useragent before displaying
2014-10-06 14:18:54 +01:00
Siebrand Mazeland
64c89613a1
Localisation updates from https://translatewiki.net .
2014-10-06 11:39:09 +02:00
John McLear
fb940897ee
Merge pull request #2257 from 0ip/fix/user-count
...
Fix broken user count
2014-10-05 12:42:52 +01:00
0ip
29f8f13423
Prevent selection on buttons
2014-10-05 13:35:20 +02:00
0ip
5008ad10c6
Fix user count
...
Still dirty, but really works.
2014-10-05 13:14:07 +02:00
0ip
ee68d43932
Fix import/export popup margin @ timeslider
2014-10-03 17:39:15 +02:00
0ip
12c1d3b05a
Fix active button ui
2014-10-03 17:35:48 +02:00
Olivier Tétard
bfde869948
If exportFileName hook isn’t defined don’t return empty filename.
...
This commit should fix #2251 .
If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.
2014-09-28 14:53:07 +02:00
Stefan
0d95c8d1ec
Revert change on position of imp/exp overlay
2014-09-14 20:26:35 +02:00
John McLear
bc8b5cc066
Merge pull request #2220 from Gared/timeslider_improvements
...
Timeslider improvements
2014-09-06 18:15:37 +01:00
John McLear
2530bf0a86
add changelog and bump v number
2014-09-06 17:25:09 +01:00
John McLear
4b7562de58
Merge pull request #2184 from qknight/patch-1
...
added /abs/path/settings.json handling
2014-08-23 21:24:46 +01:00
Stefan
cf6e5aa3ca
Fix click on timeslider loads two different revisions
2014-08-09 18:56:18 +02:00
Stefan
bb21759d78
Fix timeslider revision not changing in most cases
2014-08-09 18:52:44 +02:00
Stefan
287a7805c9
Fix position of import/export popup in timeslider
2014-08-09 14:05:04 +02:00
Simon Gaeremynck
2f8b860e69
Added a userLeave hook that gets called when a user leaves a pad
2014-08-08 15:49:15 +01:00
Siebrand Mazeland
49bba7dfe2
Localisation updates from https://translatewiki.net .
2014-08-06 16:49:48 +02:00
Joachim Schiele
63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02:00
John McLear
17f26b8c2c
Support to allow for a setting so you can stop unknown file types from being imported
2014-07-22 15:46:31 +01:00
Mike DeRosa
25f6c9bf9a
Checking if the author for the sessions match instead of comparing the entire session.
2014-07-12 16:40:59 -04:00
Mike DeRosa
7861cae763
Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready).
...
Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.
2014-07-12 16:27:00 -04:00
Marcel Klehr
9d1eca42b3
Merge pull request #2174 from ether/fix/copy-pad-update-lists
...
Fix #2136 : update cache and group list when copying pads
2014-07-08 19:07:35 +00:00
Marcel Klehr
3cafd689af
Fix Pad#copy routine for updating group list
2014-07-07 21:14:00 +02:00
Mike DeRosa
070ba40f4f
Fallback for browsers that don't support window.history.pushstate
2014-07-06 18:22:24 -04:00
kpn3m000
da0fe98edc
Fixes search on plugins without Description
...
example "tables_ssl"
2014-07-03 14:24:41 +02:00
John McLear
2ee4e9e7fd
change to line 73
2014-06-28 15:19:28 +01:00
John McLear
b657676bdd
gah can only do 1/2 a fix
2014-06-24 19:02:40 +01:00
John McLear
25ace65374
don't lose comment
2014-06-24 18:46:41 +01:00
John McLear
db045c6ffd
CSS fix for pasting plain-text in chrome, needs thorough testing
2014-06-24 18:45:54 +01:00
Siebrand Mazeland
a76dc697f0
Localisation updates from https://translatewiki.net .
2014-06-23 12:39:04 +00:00
Joachim Schiele
e17044d60e
added /abs/path/settings.json handling
...
before this path, one could only supply a relative path like:
--settings ../relative/path/settings.js
now one can also use it with absolute paths like:
--settings /abs/path/settings.json
2014-06-22 20:56:21 +02:00
Marcel Klehr
b1b972a2b4
Merge pull request #1787 from goldquest/dev_nopass_whensession
...
Grant access for valid session to password protected group pads
so, if user has valid session, they don't need the password
2014-06-17 14:01:16 +02:00
John McLear
c627608ea5
Merge pull request #1619 from ether/stricter-transport
...
Enable HSTS on TLS connections
2014-06-17 12:58:47 +01:00
Siebrand Mazeland
6dd66c6a16
Localisation updates from https://translatewiki.net .
2014-06-17 11:55:02 +00:00
Marcel Klehr
897f5189b0
Enable HSTS for TLS connections
...
Don't use X-Frame-Options: deny for now
2014-06-17 13:21:38 +02:00
John McLear
44cb676ba2
Merge pull request #2150 from ether/export-file-name-hook
...
Server side hook to modify the export file name
2014-06-16 16:47:15 +01:00
Mike DeRosa
4ccd7131d3
Added function to switch to a different pad without having to reload the whole page.
2014-06-14 14:25:56 -04:00
luto
f70309645c
pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage
2014-06-12 13:33:17 +02:00
Marcel Klehr
c4f9828825
Fix #2136 : update cache and group list when copying pads
2014-06-11 22:23:43 +02:00
Marcel Klehr
cd294c608b
Merge pull request #2149 from ether/dont-use-abiword-for-html
...
abiword shouldnt be used for HTML native documents
2014-06-11 14:47:33 +02:00
Marcel Klehr
7bec297c0a
Merge pull request #2161 from ether/bump-ueber
...
bump ueberdb for more performance on mysql
2014-06-11 14:40:54 +02:00
Stephan Jauernick
fc3ce3429e
Corrected the API Version number.
2014-06-01 21:21:08 +02:00
Stephan Jauernick
412bdd1857
Renamed the variable to prevent possible problems.
2014-06-01 21:19:15 +02:00
Stephan Jauernick
d42a9eb3a6
Enhanced the Example for the API Method getPadID and make the return value consistent to other functions
2014-05-31 11:53:44 +02:00
Stephan Jauernick
fffdde0c59
Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1
2014-05-31 00:43:31 +02:00
Stephan Jauernick
493636ec36
Added a new API method getPadID for reversing the Readonly ID and introduced the API level 1.4.1. Based on: 97402f60b8
2014-05-31 00:39:36 +02:00
John McLear
37f6dde365
bump ueberdb for more performance on mysql
2014-05-21 13:20:39 +01:00
Marcel Klehr
19be8763c9
Fix race condition
2014-05-15 12:47:28 +00:00
John McLear
c63cb812e8
Update ExportHandler.js
2014-05-15 10:53:37 +01:00
John McLear
44b1ac2b16
Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crash
...
Fix getRevisionChangeset API call making etherpad crash
2014-05-14 14:10:44 +01:00
John McLear
a82823ede2
use full string not first char
2014-05-12 15:15:10 +01:00
John McLear
d09e66e271
use call first and update docs
2014-05-12 15:08:32 +01:00
Siebrand Mazeland
9212ebe9f0
Localisation updates from https://translatewiki.net .
2014-05-12 13:42:45 +00:00
John McLear
b74c43889e
Update ImportHandler.js
2014-05-09 13:50:00 +01:00
Siebrand Mazeland
32898dec80
Localisation updates from https://translatewiki.net .
2014-05-08 08:40:43 +00:00
John McLear
ec6dc4fa0e
make async, please check
2014-05-07 16:27:41 +01:00
John McLear
69ba3cc104
remove eplite add etherpad
2014-05-07 15:17:14 +01:00
John McLear
1f7fcd54f1
working logic for allowing a server side hook to modify the export file name but NOT the extension
2014-05-06 21:13:22 +01:00
John McLear
6d38b05623
abiword shouldnt be used for HTML native documents
2014-05-06 17:32:45 +01:00
Marcel Klehr
e85d09400e
Merge pull request #2138 from ether/fix-user-icon-color-and-count
...
Fix showusers button: Show authorcolor and user_count again
2014-05-03 13:32:22 +02:00
Marcel Klehr
46ef83d710
Fix #online_count
...
Rather dirty, but works.
2014-04-30 22:32:08 +02:00
Siebrand Mazeland
20c32de5e7
Localisation updates from https://translatewiki.net .
2014-04-21 09:23:10 +00:00
John McLear
706ee1f866
fix color
2014-04-15 18:11:41 +01:00
Siebrand Mazeland
962b166c3a
Localisation updates from https://translatewiki.net .
2014-04-14 13:49:59 +00:00
Siebrand Mazeland
6597c287e2
Localisation updates from https://translatewiki.net .
2014-04-06 17:03:18 +00:00
Siebrand Mazeland
156200d0fd
Localisation updates from https://translatewiki.net .
2014-03-31 21:29:38 +00:00
Marcel Klehr
6b5e3ea3a5
Toolbar: Fix timeslider button
...
Wouldn't play nice with url params in document.location
fixes #2124
2014-03-31 20:50:01 +02:00
Marcel Klehr
80e45e1192
Fix redo toolbar command, again.
2014-03-30 13:05:51 +02:00
Marcel Klehr
6054cda473
Create a customizable timeslider toolbar
2014-03-30 13:02:41 +02:00
Marcel Klehr
867e40533a
Fix timeslider export dropdown
2014-03-30 12:30:18 +02:00
John McLear
54bf17bfea
fix error on focus remove from import/export
2014-03-29 13:32:34 +00:00
John McLear
56fd078469
Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages
...
Fix crash with queued messages
2014-03-26 19:39:19 +00:00
jdittrich
a4f2ebe57e
Update package.json
...
updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards.
2014-03-26 18:22:41 +01:00
John McLear
e23af7e439
changelog, package file and fix for redo
2014-03-26 15:44:04 +00:00
Marcel Klehr
f6f319960d
Fix REQ_CS rev boundary check
...
fixes #2096
2014-03-20 21:34:01 +01:00
Siebrand Mazeland
ba38bc998e
Localisation updates from https://translatewiki.net .
2014-03-18 12:14:27 +00:00
John McLear
e1fa43e640
quick formatting clean up
2014-03-17 19:20:32 +00:00
Marcel Klehr
da5970dda3
Refactor toolbar.js to use consistent naming
2014-03-16 15:14:21 +01:00
Marcel Klehr
51900cbf67
Toolbar: Allow custom dropdowns for plugins
2014-03-16 14:04:12 +01:00
Marcel Klehr
a369347d86
Merge branch 'pr/1579' into toolbar-test
...
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
2014-03-16 13:30:22 +01:00
goldquest
a00c505403
Sometimes, the author2session / group2session don't exist anymore, but the session does.
...
It should be possible to delete a session, if they don't exist
2014-03-14 17:50:37 +01:00
John McLear
cc03f5374c
Merge pull request #2089 from dmitryuv/changesetslib-fixes
...
fix for infinite loop on bad changeset
2014-03-13 14:39:19 +00:00
John McLear
e12093eb19
Merge pull request #2080 from ether/ignore-ctrl-pageup
...
allow tabs to be cycled when focus is in editor
2014-03-13 00:49:20 +00:00
Siebrand Mazeland
96d06abac0
Localisation updates from https://translatewiki.net .
2014-03-12 12:42:31 +00:00
John McLear
f5716a3b26
cleaner logic
2014-03-05 21:44:32 +00:00
John McLear
89d7ba0dc0
merge
2014-03-05 21:27:12 +00:00
John McLear
432438a40d
fix dintenation
2014-03-04 23:36:16 +00:00
John McLear
c3d62c5fa4
preprocessor for domline attributes
2014-03-04 23:14:15 +00:00
Marcel Klehr
6940106829
Merge pull request #2095 from vvision/develop
...
Fix plugins not being fetched (update npm)
2014-02-26 23:30:39 +01:00
Marcel Klehr
af50001769
Merge pull request #2074 from webzwo0i/fix-disconnect-on-new-changes-in-padinitialization
...
don't call ace_getInInternationalComposition if editor is not fully load...
2014-02-26 22:52:30 +01:00
vvision
eb32835ea1
Updated npm version.
2014-02-24 13:29:21 +01:00
webzwo0i
8245e65d3f
disconnect client if it submits an already accepted changeset based on an old revision
2014-02-20 18:13:30 +01:00
webzwo0i
fa681d43f7
remember user session because it can be gone when finalHandler is called
2014-02-20 17:38:25 +01:00
webzwo0i
c8c2866087
fix crash if disconnect happens for sessions that have messages queued
2014-02-20 16:33:42 +01:00
Dmitry Uvarov
0e6019344e
fix for infinite loop on bad changeset
2014-02-20 14:08:49 +04:00
Simon Gaeremynck
cfdd57b487
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
...
If the session info for a client would be null or undefined, the forEach
callback would never get called which means the padUsers callback would
never get trigged. This could potentially block API request as this function
is exposed at an HTTP API endpoint.
2014-02-19 10:48:15 +00:00
Benjamin Chodoroff
44062ae765
escape rendered npm package info
2014-02-17 11:40:30 -05:00
Siebrand Mazeland
f798e287fb
Localisation updates from https://translatewiki.net .
2014-02-09 15:22:15 +00:00
Siebrand Mazeland
65a3344f46
Localisation updates from https://translatewiki.net .
2014-02-02 12:36:23 +00:00
John McLear
7151e7827a
allow tabs to be cycled when focus is in editor
2014-02-01 07:05:25 +00:00
webzwo0i
3f31445abf
don't call ace_getInInternationalComposition if editor is not fully loaded
2014-01-28 14:07:26 +01:00
Marcel Klehr
b6f354a2de
Merge pull request #2052 from ether/fix/l10n-fallbacks-related-langs
...
Try to find related languages as a fallback
2014-01-25 05:34:11 -08:00
Siebrand Mazeland
728958e131
Localisation updates from https://translatewiki.net .
2014-01-24 19:51:24 +00:00
Marcel Klehr
fd4dd915ce
Merge pull request #2062 from Gared/enable_import_buttons
...
Fix #1835 Enable import buttons after failed import (timeout)
2014-01-24 08:26:37 -08:00
webzwo0i
a43123880a
fix randomstring
2014-01-24 01:19:14 +01:00
Gared
bf6ec18ead
Fix #1835 Enable import buttons after failed import (timeout)
2014-01-19 20:04:09 +01:00
Gared
3715535f86
Fix #2058 Add square brackets to url characters
2014-01-19 19:23:11 +01:00
Robert Helmer
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
Robert Helmer
ae99c5ea6f
new randomString function should take len arg
2014-01-15 11:44:41 -08:00
Robert Helmer
9ef709e7f7
mozilla bug 844796 - use node crypto module for randomString
2014-01-15 10:58:50 -08:00
Siebrand Mazeland
2f9a9d8695
Localisation updates from https://translatewiki.net .
2014-01-11 16:47:39 +00:00
Siebrand Mazeland
a35254c772
Localisation updates from https://translatewiki.net .
2014-01-06 11:01:26 +00:00
Marcel Klehr
9c64b6e268
Try to find related languages as a fallback
...
fixes #2029
2013-12-30 13:06:13 +01:00
Siebrand Mazeland
1e0456c7ed
Localisation updates from https://translatewiki.net .
2013-12-28 17:43:47 +00:00
Siebrand Mazeland
44f817da01
Localisation updates from https://translatewiki.net .
2013-12-23 20:11:18 +00:00
John McLear
333d2f119b
expose update browser selection function
2013-12-18 22:13:03 +00:00
John McLear
1a138438eb
dont error when pressing del on rep 0 0
2013-12-18 18:34:35 +00:00
John McLear
33ecd3d52f
Merge pull request #2041 from ether/fix-get-attr
...
better handling for attribute queries
2013-12-17 12:49:28 -08:00
John McLear
8313083cd9
better handling for attribute queries
2013-12-17 20:48:19 +00:00
Marcel Klehr
adf05576b2
Don't crash if CHANGESET_REQ fails
2013-12-17 16:20:57 +01:00
s1341
5add63165d
Fix server side bug index overflow
...
The server wasn't properly checking that the changesets it needed to
return for changeset_requests actually existed.
2013-12-17 15:37:35 +02:00
Siebrand Mazeland
6f6a86faa6
Localisation updates from https://translatewiki.net .
2013-12-17 08:52:50 +00:00
John McLear
7d47d91a08
Merge pull request #1514 from ether/dont-die-on-bad-html
...
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-16 03:08:42 -08:00
Grant Woodford
17666eaef7
Changed to not use inline JavaScript
2013-12-15 12:02:43 +02:00
Lennart Brinkmann
dd8af99e2e
Add input validation for html param in setHTML()
2013-12-14 21:14:56 +01:00
John McLear
58cd71dcce
Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop
2013-12-10 19:25:36 +00:00
John McLear
58bbfd8a65
resolve merge conflict
2013-12-09 21:55:04 +00:00
John McLear
24e96c4f8b
Merge pull request #2028 from webzwo0i/remove-deadcode
...
Remove deadcode
2013-12-09 10:49:57 -08:00
John McLear
438f3fc717
Merge pull request #2030 from ether/import_hook
...
Working import hooks
2013-12-09 10:22:40 -08:00
John McLear
3180b96213
Remove console logs
2013-12-09 18:13:07 +00:00
John McLear
505dc70df5
Merge pull request #2013 from ether/getAttributeOnSelection
...
getAttributeOnSelection function
2013-12-09 09:46:57 -08:00
John McLear
bae77666a4
Merge pull request #2027 from webzwo0i/fix-import
...
fix closing of </title> tag
2013-12-09 06:56:22 -08:00
webzwo0i
77cf2aafac
[pad_modals] remove unused variables. for the hide/show functions jquery's default variables are used everywhere
2013-12-08 17:35:11 +01:00
webzwo0i
9400425b1e
[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused
2013-12-08 17:33:58 +01:00
webzwo0i
ab797c9831
[pad_connectionstatus] padeditbar is not used anywhere in pad_connectionstatus
2013-12-08 17:31:46 +01:00
webzwo0i
906ab1820b
[timeslider] do not include underscore, as its not (longer) used
2013-12-08 17:31:18 +01:00
webzwo0i
1fa8c2a7e6
[collab_client] remove unused function getStats
2013-12-08 17:30:48 +01:00
webzwo0i
6aaf4c4065
[collab_client] remove keys function, which was not used and variable reconnectTimes which was used for some long gone disconnect tracking code
2013-12-08 17:30:25 +01:00
webzwo0i
aadcfbb3d1
do not send globalPadId in clientvars - its not used anywhere
2013-12-08 17:29:41 +01:00
webzwo0i
ca6f877db2
[padDiff] remove unused functions a?lines_length
2013-12-08 17:28:43 +01:00
webzwo0i
021db28a02
[Changeset] a?lines_length was not used within inverse function
2013-12-08 17:27:48 +01:00
webzwo0i
e04f46d477
[ace2_inner] init() has replaced setup(), reflect this change in the comments and remove the unused setup()
2013-12-08 17:25:12 +01:00
webzwo0i
020bd3915c
remove empty&unused overlaysdiv
2013-12-08 17:24:12 +01:00
webzwo0i
4dd3584532
[ace2inner] remove unused function boldColorFromColor
2013-12-08 17:22:55 +01:00
webzwo0i
a714f63597
[ace2inner] remove unused recolorLineByKey that was part of old recolor module
2013-12-08 17:22:20 +01:00
webzwo0i
3dc844eb08
[ace2_inner] remove unused getLineKeyForOffset that was part of old recolor module
2013-12-08 17:21:53 +01:00
webzwo0i
eee355979d
[ace2_inner] remove unused function htmlForRemovedChild
2013-12-08 17:21:27 +01:00
webzwo0i
8175af3017
[collab_client] remove socketid because its not used
2013-12-08 17:20:53 +01:00
webzwo0i
f25fed1c25
[ace2_inner] remove incorpIfQuick because its unused since July
2013-12-08 17:15:38 +01:00
webzwo0i
4044d5ae47
remove hidden input field padId which is send on every import but not used
2013-12-08 17:14:01 +01:00
webzwo0i
e1fbb1d1aa
fix loop
2013-12-08 13:53:26 +01:00
webzwo0i
9557dc9dba
remove unused require
2013-12-08 13:48:21 +01:00
webzwo0i
c3081c046b
function scope: variables only need to be declared once
2013-12-08 13:47:05 +01:00
webzwo0i
0fa0d6dc2c
remove now unused code
2013-12-08 13:45:45 +01:00
webzwo0i
27e0c37779
refactor export of style attributes
...
1. mark all attributes that are used
2. find the outermost attribute that is no longer used
3. close all tags upto this attribute
4. open all tags that are used and not open
(5. close all open tags)
2013-12-08 13:39:50 +01:00
webzwo0i
f968b5a057
useless var statement (function scope)
2013-12-08 11:37:47 +01:00
webzwo0i
51769585a9
workaround so that at least one tag stays open if its the outermost tag. saves some space in the output
2013-12-08 11:37:07 +01:00
webzwo0i
656a558af9
be more clear about the value in propVals
2013-12-08 11:35:28 +01:00
webzwo0i
a534b1ec22
some more docs for attribute export and cleanup empty lines
2013-12-08 11:34:11 +01:00
webzwo0i
70c51d731b
add some documentation for styling attributes export
2013-12-08 11:33:20 +01:00
webzwo0i
86791707cd
fix export so no tags are omitted
2013-12-08 11:31:23 +01:00
John McLear
8a547b24ba
resolve issue where first char showed all formatting
2013-12-07 17:37:52 +00:00
John McLear
98c4e32a14
Merge pull request #2026 from ether/afterEditHook
...
after Edit eejs block
2013-12-07 08:55:04 -08:00
webzwo0i
01c71085e4
fix closing of </title> tag
2013-12-07 00:18:36 +01:00
Siebrand Mazeland
03d5acfd0c
Localisation updates from https://translatewiki.net .
2013-12-05 22:01:36 +00:00
Marcel Klehr
37442d301c
Merge pull request #2021 from ldidry/fix-no-tab-indent
...
Replace tabs indentation with spaces indentation
2013-12-05 06:22:33 -08:00
Marcel Klehr
60017e9190
Merge pull request #2019 from ether/lighter-colors
...
allow for lighter colors
2013-12-05 05:42:14 -08:00
Luc Didry
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear
20b27c602c
Merge branch 'afterEditHook' of github.com:ether/etherpad-lite into getAttributeOnSelection
2013-12-04 23:36:26 +00:00
John McLear
749e557b84
after Edit eejs block
2013-12-04 23:17:32 +00:00
John McLear
378e07964b
allow for lighter colors
2013-12-04 23:01:08 +00:00
John McLear
03ff5563f4
Merge pull request #2017 from eloydegen/master
...
Update pad.html
2013-12-02 08:21:38 -08:00
Eloy
de3a657c6b
Update pad.html
...
Select the URL when click at the text.
2013-12-02 16:43:52 +01:00
Siebrand Mazeland
f2e63df9cb
Localisation updates from https://translatewiki.net .
2013-12-02 08:26:08 +00:00
John McLear
30f577e8f4
dont assume formatting is on the start of any line
2013-12-01 20:01:17 +00:00
John McLear
95db100f12
remove white space
2013-12-01 18:56:05 +00:00
John McLear
39f81fdb9e
remove post ace event
2013-12-01 18:55:42 +00:00
John McLear
3791ad4186
ends of line shouldn't show incorrect formatted status
2013-12-01 18:54:46 +00:00
John McLear
b4877f002d
handle logic for line lengths with 0
2013-12-01 18:06:56 +00:00
Grant Woodford
d1367484e3
Added a way to closed the extended chat window
2013-11-28 21:53:00 +02:00
Grant Woodford
383a216a7d
Added a way to closed the extended chat window
2013-11-28 21:48:08 +02:00
John McLear
e9f7583793
some nice css to that reflect when a button is active
2013-11-28 17:44:37 +00:00
John McLear
dee2dab7c4
getAttributeOnSelection function
2013-11-28 17:27:52 +00:00
John McLear
271dd663bf
foo
2013-11-28 17:22:34 +00:00
John McLear
6fcc7c77f9
not working and erally confused
2013-11-27 00:23:11 +00:00
s1341
5181b3e467
add josnminify to package.json
2013-11-26 10:28:33 +02:00
s1341
9b7203d4d2
have the server parse the settings file using minify and strip commas
2013-11-26 10:20:59 +02:00
s1341
7550be0921
strip off trailing commas
2013-11-26 10:11:32 +02:00
John McLear
b527ef2bc5
Merge pull request #2010 from ether/sticky-chat-resize
...
Sticky chat resize
2013-11-25 09:36:44 -08:00
John McLear
3be1ee5967
slightly cleaner
2013-11-25 17:36:24 +00:00
John McLear
252be19885
make sticky chat mroe responsive to changes in top bar
2013-11-25 17:33:33 +00:00
s1341
45e0680484
move copy/move pad into a new api version
2013-11-24 22:34:56 +02:00
Marcel Klehr
5d803a0523
Fix walking caret bug
...
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
2013-11-22 17:18:30 +01:00
Siebrand Mazeland
117a4ab1a8
Localisation updates from http://translatewiki.net .
2013-11-21 06:39:40 +00:00
Siebrand Mazeland
106661712d
Localisation updates from http://translatewiki.net .
2013-11-19 06:43:22 +00:00
s1341
52a99eb9e5
fix bugs, add force option to overwrite destination
2013-11-18 08:25:46 +02:00
s1341
93fcab0461
change parameter names
2013-11-17 21:01:02 +02:00
s1341
29d8bb7716
add pad copy/move API functions
2013-11-17 17:02:44 +00:00
Siebrand Mazeland
1ee7c7000f
Localisation updates from http://translatewiki.net .
2013-11-12 13:44:57 +00:00
Marcel Klehr
8e5af48f79
en.json: Add keyboard shortcuts for indent and outdent to translations
2013-11-08 15:18:23 +00:00
Luc Didry
4a9602cc57
Fix getRevisionChangeset API call making etherpad crash
2013-11-07 22:49:20 +01:00
Siebrand Mazeland
c9b80c6120
Localisation updates from http://translatewiki.net .
2013-11-04 16:04:11 +00:00
Marcel Klehr
8ab2442cc9
Update padList correctly
...
fixes #1971
2013-11-01 14:16:26 +01:00
Marcel Klehr
975eae350e
Merge pull request #1963 from eyesonlyhack/allLinksTranslatingToHTTP
...
Fix #1776 - All links regardless of protocol translate to http:// links
2013-10-28 04:15:17 -07:00
Marcel Klehr
7b84e7308b
Merge branch 'metrics' into develop
...
Conflicts:
src/node/handler/PadMessageHandler.js
2013-10-28 12:11:25 +01:00
Marcel Klehr
3ad4b1b837
stats: Add http500, memoryUsage, pendingEdits gauges
...
and turn edits metric into a timer instead of a simple meter
2013-10-27 21:43:32 +01:00
Siebrand Mazeland
84b19a56d5
Localisation updates from http://translatewiki.net .
2013-10-27 19:17:18 +00:00
Marcel Klehr
387091c5c9
Expose current stats at /stats
2013-10-27 18:11:50 +01:00
Marcel Klehr
940f114a84
Record metrics with 'measured'
2013-10-27 17:42:55 +01:00
Kenan Sulayman
7ab65d7112
Refactors APIHandler:callAPI
...
Refactors and optimizes the APIHandler->callAPI.
2013-10-25 12:14:22 +02:00
Grant Woodford
c3a58f42e7
Added a better way of detecting when a url does not have a protocol specified
2013-10-21 22:15:46 +02:00
Marcel Klehr
e8c69a5474
Update changelog and bump version
2013-10-21 20:18:16 +02:00
Marcel Klehr
d43945db07
Merge pull request #1950 from eyesonlyhack/disableIPlogging
...
Privacy: Add an option to disable IP logging
2013-10-21 08:05:05 -07:00
Grant Woodford
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
Siebrand Mazeland
b1b801e7c7
Localisation updates from http://translatewiki.net .
2013-10-19 19:37:02 +00:00
John McLear
a120d78b7e
Merge pull request #1943 from ether/fix/listAllPads-fix
...
Pad list cache: You can't change the cache if it's not initiated
2013-10-14 09:21:27 -07:00
Marcel Klehr
22b0bafafd
Pad list cache: You can't change the cache if it's not initiated
...
(as per 200f250717
2013-10-14 18:20:24 +02:00
Siebrand Mazeland
96c366b1e1
Consistent spelling style
...
Spotted by Shirayuki in https://translatewiki.net/wiki/Thread:Support/About_EtherpadLite:Pad.modals.badChangeset.cause/en
2013-10-14 11:11:31 +00:00
Siebrand Mazeland
e308c265af
Localisation updates from http://translatewiki.net .
2013-10-14 08:55:30 +00:00
vileda
77c2313025
pass correct padID to checkAccess if pad is requested via readOnly link
2013-10-13 22:31:41 +02:00
Marcel Klehr
200f250717
You don't need the padList if you want to alter it
...
Don't query the db for caching a list of pads if you only want to alter the list
2013-10-13 21:20:19 +02:00
John McLear
680d9a2811
Don't try to populate padlist on each req
...
This is an important fix, prolly wants merging into master ASAP.
Before this fix each new pad request would re-populate the all pads object, this is a blocking procedure and slows down the loading to a point where it's almost useless :(
Testing didn't find this because our testing stack isn't populated with pad data :| TLDR. Our tests still suck, hard.
2013-10-13 16:39:45 +01:00
Marcel Klehr
8c9e543b91
Fix disconnect modals
2013-10-12 22:29:03 +02:00
Marcel Klehr
614ca6bd90
Merge branch 'develop' into release/1.2.12
2013-10-12 20:29:49 +02:00
Marcel Klehr
64392542f9
Merge pull request #1938 from ether/fix/unknown-connection-message
...
Drop messages from unknown connections
2013-10-12 11:24:51 -07:00
Marcel Klehr
aa77a615da
Drop messages from unknown connections
...
fixes #1908
2013-10-12 18:51:04 +02:00
Marcel Klehr
048d55a64c
Don't create new pad if a non-existant read-only pad is accessed
...
fixes #1848
2013-10-12 18:41:48 +02:00
Marcel Klehr
74bc2bd761
Prepare release
2013-10-12 14:16:06 +02:00
Marcel Klehr
7f10b9a42f
Add explanations for more disconnect scenarios
2013-10-10 21:11:15 +02:00
Marcel Klehr
de50efc71a
Merge pull request #1927 from ether/fix/client-side-error-logging-in-server-log
...
Polish logging of client-side errors on the server
2013-10-10 11:14:54 -07:00
Marcel Klehr
22e9e5fdcd
Merge pull request #1926 from ether/fix/no-connect-to-corrupt-pad
...
Fix a whole range of bugs related to corrupted changesets
2013-10-10 11:07:37 -07:00
Marcel Klehr
46511d6144
Polish the error messages of the easysync lib
2013-10-10 20:02:13 +02:00
Marcel Klehr
b7c7685dc7
Polish logging of client-side errors on the server
2013-10-10 18:45:22 +02:00
Marcel Klehr
d4c99d40b8
Never keep processing a changeset if it's corrupted
2013-10-10 18:19:25 +02:00
Marcel Klehr
6689a3c02e
Catch errors during preparation of client vars
...
... and disconnect the user
2013-10-10 16:38:41 +02:00
Marcel Klehr
ccf4683558
Easysync: Throw an error if an unknown attrib is referneced
2013-10-10 16:38:16 +02:00
John McLear
d86d99bc16
Merge pull request #1925 from ether/move-padlist-init
...
Move padlist init
2013-10-09 11:45:59 -07:00
John McLear
2992e3ea2b
clean up
2013-10-09 16:34:50 +01:00
John McLear
40a65bd41c
more warns
2013-10-09 16:17:36 +01:00
John McLear
c93acdfc87
suggestion
2013-10-09 16:14:16 +01:00
Marcel Klehr
de73de38b1
Filter author attribs in client_vars.historicalAuthorData
2013-10-07 18:58:20 +02:00
Marcel Klehr
9fac515885
Revert "do not pass historical author data to read only users"
...
This reverts commit b32aaaeb1b
2013-10-07 18:54:57 +02:00
John McLear
d7088031fa
remove white space
2013-10-06 15:16:32 +01:00
John McLear
b32aaaeb1b
do not pass historical author data to read only users
2013-10-06 15:15:43 +01:00
Siebrand Mazeland
eb611e2b36
Localisation updates from http://translatewiki.net .
2013-10-05 21:56:44 +00:00
John McLear
37586d646e
Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-author
...
allow author manager to use custom error module
2013-10-03 06:46:17 -07:00
John McLear
bf1e1c3007
allow author manager to use custom error module
2013-10-03 14:45:23 +01:00
John McLear
6dc4240985
Merge pull request #1919 from ether/make-username-show-properly
...
use val not value, broken with newer jq
2013-10-02 16:37:29 -07:00
John McLear
d69df91709
use val not value, broken with newer jq
2013-10-03 00:36:15 +01:00
Marcel Klehr
7b17bd58ae
Merge branch 'pr/1756' into develop
...
Conflicts:
src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
Eric Schrijver
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
John McLear
716e929e64
works but hides caret on full line and not on X too, X is much harder to do
2013-09-29 08:19:57 +01:00
John McLear
6e4d94069f
Merge pull request #1906 from ether/down-arrow-dont-be-weird
...
Down arrow dont be weird
2013-09-28 23:38:45 -07:00
John McLear
f59df2bb80
Merge pull request #1902 from ether/fix/handle-message-continuation
...
Don't stop processing changesets if there is an error
2013-09-28 23:38:26 -07:00
John McLear
e573461c9b
Merge pull request #1909 from ether/dont-crash-blank-html-import
...
dont crash on importing blank html
2013-09-27 12:06:05 -07:00
John McLear
c615ccf514
dont crash on importing blank html
2013-09-27 14:47:34 +01:00
John McLear
7d1d73f8a6
doh, wasnt supposed to add this background
2013-09-25 22:20:13 +01:00
John McLear
ed04842801
more sensible reload without cache message
2013-09-25 22:18:51 +01:00
John McLear
c8109b7398
sanity also control home support
2013-09-25 15:56:56 +01:00
John McLear
487f1a969f
vast improvement on movement of caret due to isolation of cause of problem - TLDR is Chrome detects blank rows line heights as incorrect
2013-09-25 14:57:02 +01:00
Marcel Klehr
6a02302fc9
/admin/plugins: Fix search algorithm (use string match in lower case)
...
fix #1903
2013-09-23 19:55:35 +02:00
Marcel Klehr
7f7d506ff3
Don't stop processing changesets if there is an error
...
fixes #1895
2013-09-23 16:38:55 +02:00
John McLear
4bea3a348e
strip title out of html during import, pesky abiword behavior
2013-09-21 23:29:32 +01:00
John McLear
240a96221a
Merge branch 'develop' of github.com:ether/etherpad-lite into import-button-styling
2013-09-21 16:23:12 +01:00
John McLear
e35c45e9b5
make export clearly seperated from import
2013-09-21 16:22:43 +01:00
John McLear
ca680a32b6
fix padding so export icons show properly
2013-09-21 16:17:19 +01:00
John McLear
05a8ae7acc
padding on import now button
2013-09-21 16:15:59 +01:00
John McLear
204118eea5
dont crash on malformed HTML import
2013-09-21 16:11:56 +01:00
Guillaume AMAT
96adb4d626
The #importsubmitinput button was too small and hidden its value
2013-09-21 12:39:45 +02:00
Guillaume AMAT
6de3a400e1
The import/export columns were not displayed correctly
2013-09-21 12:38:26 +02:00
Marcel Klehr
182ce5c48d
API: fix createGroup for mapper endpoint for cases when a mapped group has been deleted
...
fixes #1890
2013-09-18 16:04:10 +02:00
daniel tygel
1cfde05139
fix .popup CSS to fit in small spaces, like thin iframe
2013-09-17 11:26:11 -06:00
Marcel Klehr
2b46bc40a1
Beautify infinite scroll
2013-09-12 16:37:37 +02:00
Marcel Klehr
8073c62de3
Merge pull request #1882 from fviard/develop
...
Fix to check if searchTerm is not "undefined" before trying to use it to...
2013-09-12 05:50:39 -07:00
Marcel Klehr
c2e60a3919
Merge pull request #1850 from Wikinaut/develop
...
adding backlinks to main page on admin pages
2013-09-12 05:46:14 -07:00
Florent Viard
6f478c4de1
Fix to check if searchTerm is not "undefined" before trying to use it to filter search results.
...
Signed-off-by: Florent Viard <fviard@lacie.com>
2013-09-11 11:36:09 +02:00
John McLear
c4fcedbb8d
Merge pull request #1879 from Gared/binary-upload-fix
...
Add check if uploaded file only contains ascii chars when abiword disabled
2013-09-10 13:48:26 -07:00
Gared
b336e38637
Add check if uploaded file only contains ascii chars when abiword disabled
2013-09-10 21:58:28 +02:00
vileda
43e1af93c1
allow users to have colons in password
2013-09-10 16:00:36 +02:00
Siebrand Mazeland
c08a4dd01f
Localisation updates from http://translatewiki.net .
2013-09-09 18:49:10 +00:00
John McLear
527b7ad7f8
Merge pull request #1874 from tonoman3g/fix-padUsers-http-api-call
...
fix padUsers http api call in PadMessageHandler.js.
2013-09-09 08:00:11 -07:00
tonoman3g
e60591a4d5
fix padUsers http api call in PadMessageHandler.js.
...
Add callback() function call to iterator function.
2013-09-09 21:24:41 +07:00
goldquest
842e09a7ad
Merge branch 'upstream/develop'
2013-09-04 15:30:37 +02:00
Siebrand Mazeland
7ecf5f8c52
Localisation updates from http://translatewiki.net .
2013-09-02 18:50:54 +00:00
Wikinaut
4305bb16ed
utf-8 without BOM; removed trailing white spaces
2013-08-14 21:46:57 +02:00
Wikinaut
c3bffc2623
adding backlinks to main page in Admin pages; fix for https://github.com/ether/etherpad-lite/issues/1277
2013-08-14 21:42:59 +02:00
Siebrand Mazeland
cb3ab51ee1
Localisation updates from http://translatewiki.net .
2013-07-30 17:46:04 +00:00
Marcel Klehr
40f578cfbd
Merge pull request #1816 from bit/sessioninfos
...
export sessioninfos
2013-07-23 05:14:45 -07:00
Marcel Klehr
c39eb4f443
Make use of the new plural macro
2013-07-23 12:43:30 +02:00
Marcel Klehr
dabba91152
Update html10n.js
2013-07-23 12:42:55 +02:00
Siebrand Mazeland
100c4627ec
Localisation updates from http://translatewiki.net .
2013-07-22 15:44:42 +00:00
Marcel Klehr
5e3abb7054
Update en.sjon translation
...
pad.importExport.abiword.innerHTML
2013-07-22 15:52:48 +02:00
John McLear
53fb4fc3fe
Merge pull request #1833 from digitalbazaar/fix-chrome-longlines-slowdown
...
Make pads with long lines usable with chrome.
2013-07-14 14:59:21 -07:00
Siebrand Mazeland
3a9ef306a6
Localisation updates from http://translatewiki.net .
2013-07-14 21:25:00 +00:00
Dave Longley
3a47e719d4
Make pads with long lines usable with chrome.
...
- Do not use incorpIfQuick on keyup because it's not ever quick
on chrome. Calling incorpIfQuick calls incorporateUserChanges
which sets a flag on the current callstack state indicating
that the selection has changed (since something was typed).
Whenever this flag is set, the event handler will run code
to update the selection (and possibly scroll the view as
well), which is a very costly operation in webkit browsers.
Instead let the user changes be incorporated by the idle worker,
scheduling it to run ASAP on keyup. This isn't a perfect
solution, but may make pads running on webkit browsers more
usable with otherwise fairly unnoticeable changes in the UI.
2013-07-14 01:51:39 -04:00
John McLear
98a9a24d02
repo url as latest npm shows warn if non existant
2013-06-26 20:19:38 +01:00
John McLear
53529cd031
Merge pull request #1815 from bit/patches
...
Some Patches
2013-06-25 06:54:51 -07:00
John McLear
ba1a5da76d
bump and changelog
2013-06-24 13:35:17 +01:00
John McLear
ee8af3454c
Merge pull request #1753 from ether/dont-crash-noauth
...
dont crash on no auth, just a bandaid
2013-06-18 07:52:34 -07:00
j
a62593e9a0
export sessioninfos so plugins can access it
...
allows plugins to map client.id to author id
2013-06-17 16:54:02 +02:00
j@mailb.org
9dd6471921
Add userLeave hook
2013-06-17 15:53:01 +02:00
j@mailb.org
bc5dc74f90
pass pad in postAceInit hook
...
no way for plugins to access current pad otherwise.
2013-06-17 15:52:51 +02:00
j@mailb.org
a554552bed
Simpify CSS for sticky chat
2013-06-17 14:47:28 +02:00
Siebrand Mazeland
315e229c83
Localisation updates from http://translatewiki.net .
2013-06-17 11:28:14 +00:00
John McLear
3d65f3d052
Merge pull request #1807 from dummys/develop
...
added log4js 0.6.6
2013-06-15 00:17:50 -07:00
John McLear
ae78c6731d
Merge pull request #1811 from clkao/author-style-hook
...
Document author style hook and provide outer_ace dynamic css manager
2013-06-15 00:17:09 -07:00
Chia-liang Kao
f31db205da
allow cssmanager to manage outer_ace
2013-06-15 01:38:46 +08:00
dummys
8278ef3c7c
added log4js 0.6.6
2013-06-13 15:10:32 +02:00
Kyle Kelley
82de797642
Only kept URL schemes which have an RFC standard
2013-06-12 12:31:38 -05:00
Kyle Kelley
b4f155c028
Cleanup gophers
2013-06-12 11:20:36 -05:00
Siebrand Mazeland
4c264aec4d
Localisation updates from http://translatewiki.net .
2013-06-10 08:45:19 +00:00
Chia-liang Kao
548f31a46a
new hook: aceSetAuthorStyle
2013-06-06 13:03:40 +08:00
Chia-liang Kao
eae9faa28c
refactor setAuthorStyle
2013-06-06 12:30:48 +08:00
goldquest
7528ddf610
typo
2013-05-29 16:54:39 +02:00
goldquest
121c02c74f
Grant access, when valid session is available and sessionNoPassword is set
2013-05-29 16:53:14 +02:00
Siebrand Mazeland
7d81a6d042
Localisation updates from http://translatewiki.net .
2013-05-26 09:36:03 +00:00
Siebrand Mazeland
9c69753a35
Localisation updates from http://translatewiki.net .
2013-05-20 09:30:23 +00:00
Siebrand Mazeland
8ee15d4003
Localisation updates from http://translatewiki.net .
2013-05-12 18:40:40 +00:00
Siebrand Mazeland
923c01745b
Localisation updates from http://translatewiki.net .
2013-05-09 13:39:04 +00:00
Marcel Klehr
90d1598688
Merge pull request #1751 from goldquest/dev_IE8-fix
...
Fixing IE8 errors
2013-05-08 07:19:15 -07:00
John McLear
2273cf9ed6
Merge pull request #1740 from ether/feature/add-cs-queue
...
add a changeset queue
2013-04-28 13:58:08 -07:00
John McLear
9f2bab2ba3
Merge pull request #1760 from bemeric1/develop
...
Issue #1652 : Fix to client-side-induced changeset spamming.
2013-04-28 13:11:34 -07:00
Siebrand Mazeland
702a300164
Localisation updates from http://translatewiki.net .
2013-04-28 17:48:19 +00:00
Marcel Klehr
2c855de6f6
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-27 23:04:42 +02:00
Brian Emerick
e7d8f124ad
Issue #1625 : Fix to client-side-induced changeset spamming.
...
THE BUG - HIGH LEVEL:
- When client A sends out an attribute change, client B applies that change to itself but
also thinks that it made the change itself, which is incorrect. This means that when client B
next makes a change, he will send out that he made the attrib change that A actually made.
- Ex: Have 2 clients on the same pad. Have A apply bold on some text. Next, have B type a character.
B will broadcast that it both added a character AND applied bold, when in reality it did NOT
apply bold at all, that change was done by the other client and this client incorrectly adopted it as its own.
- This root bug behavior results in clients continuing to think that they each made the other client's change,
thus resulting in an infinite loop of changeset spamming that bogs down clients and harms server stability.
THE BUG - IN DEPTH:
- The root issue is in the way that Changesets are combined in Changeset.follow(). Specifically, in the case of a
changeset with ONLY new attrib changes (no text changes) being merged with an identity changeset (has no ops).
- In this case, Changeset.follow() copies the ops of the new CS and fully overrides the other CS.
- applyChangesToBase invokes Changeset.follow to determine the final client document CS state after applying the new CS.
If the final client document CS state is NOT the identity CS, then the client broadcasts that it made a change.
- When client A changes just attribs, client B's applyChangesToBase calls Changeset.follow() and passes client A's
changeset (attrib change) and Client B's current changeset state (identity).
- As per the noted bug, Changeset.follow() returns client A's changeset as a result, causing client B to adopt
client A's changeset as its own document state. Thus, client A ends up thinking it has made client B's changes.
THE FIX:
- Changeset.follow() should NOT copy the ops of the new CS passed in if those changes are only attrib changes.
This allows applyChangesToBase to properly set the client's CS back to the identity after applying an
external attrib change, instead of incorrectly adopting the external client's changes.
2013-04-24 15:18:25 -07:00
Spruce (Felix Fichte)
fb0bc31056
updated to use settings
...
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
2013-04-24 12:19:41 +02:00
spruce
6ea5efbcc3
Update SocketIORouter.js
...
Changed the setting of client.remoteAddress
2013-04-22 23:01:41 +03:00
Siebrand Mazeland
f0f98b41fe
Localisation updates from http://translatewiki.net .
2013-04-21 12:29:25 +00:00
John McLear
bf4c86ed94
better message for admins
2013-04-17 23:48:11 +01:00
John McLear
63b00b9010
Merge branch 'feature/add-cs-queue' of github.com:ether/etherpad-lite into dont-crash-noauth
2013-04-17 20:04:25 +01:00
John McLear
3b8621c6a0
dont crash on no auth, ust a bandaid
2013-04-17 19:50:05 +01:00
goldquest
98c43aff43
fixed spacing
2013-04-17 18:17:14 +02:00
John McLear
f478f99995
Merge pull request #1750 from ether/fix/authorship-once-and-4-all
...
Fix authorship sanitization
2013-04-17 08:13:22 -07:00
goldquest
896f72311f
use document, not doc
2013-04-17 16:51:54 +02:00
goldquest
566034ddf0
IE8 don't knows the Array.forEach function (simple version fix)
2013-04-17 16:51:43 +02:00
goldquest
b08a6e522f
IE8 complains, if catch block is missing
2013-04-17 16:51:21 +02:00
Marcel Klehr
146c75e703
Remove console.log in content collector
...
fixes #1731
2013-04-17 16:37:45 +03:00
Marcel Klehr
560fd55bf2
Fix authorship sanitization
...
author colors wouldn't get disttributed, if their id was greater than 9
(due to apool encoding them to base 36)
2013-04-17 15:24:40 +02:00
Marcel Klehr
cd288c70cb
Don't block changeset queue with delivering changeset
2013-04-17 14:26:11 +02:00
Marcel Klehr
1c8b7a3661
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-17 14:25:23 +02:00
John McLear
e7a80b7b77
still express is stuck at 3.1.0
2013-04-16 00:12:11 +01:00
cohitre
602380abb7
passing the ToolbarItem to the callback
2013-04-15 16:06:32 -07:00
John McLear
f987299a5d
catch error on export
2013-04-15 23:01:08 +01:00
cohitre
0c52fb5e30
Normalizing how select and button commands are triggered.
2013-04-15 11:32:59 -07:00
Marcel Klehr
76e50e2c4d
Refactor SocketIORouter
2013-04-15 20:29:06 +02:00
John McLear
9b952da692
Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect
2013-04-15 19:07:01 +01:00
John McLear
9a863824c9
update connect and express
2013-04-15 19:06:22 +01:00
John McLear
4989f56673
undo avoid changeset spam as it breaks functionality
2013-04-15 14:36:25 +01:00
John McLear
2c8699506d
push express back as it breaks sessions
2013-04-15 12:21:10 +01:00
John McLear
c3c7a3d128
Merge pull request #1721 from ether/dont-send-same-cs-spam
...
temp patch for #1652
2013-04-15 04:20:05 -07:00
Siebrand Mazeland
8a2977381f
Localisation updates from http://translatewiki.net .
2013-04-14 11:54:26 +00:00
cohitre
90837437c5
Moving the toolbar plugin calls.
2013-04-13 12:06:51 -07:00
John McLear
08b54ef61b
Merge pull request #1732 from ether/authorID-2
...
Correct authorID in Changeset on modification
2013-04-12 06:36:39 -07:00
John McLear
337179fddd
remove console logs and cruft
2013-04-12 14:34:07 +01:00
Marcel Klehr
f4de7f6a90
Use a string instead of an array!
2013-04-11 21:23:38 +02:00
Marcel Klehr
49013b18c7
We need to replace all new author attribs with thisSession.author, in case someone copy/pasted or otherwise inserted other peoples changes
2013-04-11 21:12:59 +02:00
Marcel Klehr
e8d953a15c
Use the correct version number
2013-04-11 19:08:07 +03:00
John McLear
f9d23767f8
Merge pull request #1709 from ether/keep-list-order-on-paste
...
When you paste into a numbered list, keep some integrity
2013-04-11 09:07:22 -07:00
John McLear
a81a40d75b
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2013-04-11 17:05:24 +01:00
John McLear
f4123d2904
bump v and readme
2013-04-11 17:04:54 +01:00
John McLear
dc6e2e13fe
Merge pull request #1723 from ether/expose-broadcastslider
...
expose broadcast slider so plugins can interact with it
2013-04-11 09:03:43 -07:00
Marcel Klehr
594757cc47
html10n.js: Don't break in getDirection if language hasn't been set
...
fixes #1724
2013-04-11 18:51:49 +03:00
John McLear
9581097dc7
remove cruft
2013-04-11 16:39:25 +01:00
John McLear
1fc906017c
final css
2013-04-11 16:38:41 +01:00
John McLear
e712f7665d
working solution props to dmitryu for making me not be scared of modifying div clases
2013-04-11 16:33:03 +01:00
Marcel Klehr
c755633f09
Update html10n.js to correctly use the console.log shim
...
fixes #1724
2013-04-10 17:56:09 +02:00
John McLear
4a5e63f105
Merge pull request #1693 from guyzmo/api_extension
...
extension of the API (versioned 1.2.8)
2013-04-09 14:49:11 -07:00
John McLear
9dfac79107
no need to declare var twice
2013-04-09 15:58:18 +01:00
John McLear
8836981e32
expose broadcast slider so plugins can interact with it
2013-04-09 15:55:14 +01:00
John McLear
90c5b26e89
keep integrity on paste and better styling but new lists dont reset counter
2013-04-09 14:29:55 +01:00
John McLear
2e76bd4e50
working but then create a second list, it will be stupid, SIGH
2013-04-09 01:22:09 +01:00
John McLear
7885c410b5
Merge branch 'develop' of github.com:ether/etherpad-lite into keep-list-order-on-paste
2013-04-09 00:52:04 +01:00
John McLear
bfa233ba04
kudos to quenenni for some working CSS
2013-04-09 00:46:13 +01:00
John McLear
70a25964b6
make sure elements are supported, still doesn't assign numbers properly
2013-04-08 23:32:04 +01:00
John McLear
49cff88a48
semi working
2013-04-08 23:03:19 +01:00
John McLear
7098ba49f3
Merge pull request #1722 from mluto/remove-top-console-log-in-collab-client
...
use `parent.parent` instead of `top` in `collab_client.js`
2013-04-08 14:09:36 -07:00
mluto
dfc49df52d
use parent.parent instead of top in collab_client.js, since top breaks embedding when a pad is embedded (same origin policy)
2013-04-08 22:58:34 +02:00
John McLear
bf93500214
some polish for a turd
2013-04-08 19:50:52 +01:00
John McLear
946289c221
temp patch for 1652
2013-04-08 19:46:45 +01:00
John McLear
7728d5b321
remove draggable which was used for dragging users in the userbox
2013-04-08 17:23:03 +01:00
John McLear
12bc98af7e
Merge pull request #1716 from ether/only-redraw-existing-lines
...
only try to redraw the line height of lines that exist..
2013-04-08 08:44:48 -07:00
Marcel Klehr
324b9b1f5f
pluginfw/installer: Only restart the server when all tasks have finished
...
fixes #1685
2013-04-08 16:14:03 +02:00
John McLear
f135f79d13
only try to redraw the line height of lines that exist..
2013-04-07 19:06:15 +01:00
John McLear
ffc8f61a2f
remove cruft
2013-04-07 18:44:13 +01:00
John McLear
6c47e29e07
restore PMH original
2013-04-07 18:43:49 +01:00
John McLear
12a2da2884
attempting to get right client authorid sent with changeset
2013-04-07 18:40:55 +01:00
Siebrand Mazeland
555be31eab
Localisation updates from http://translatewiki.net .
2013-04-07 17:11:22 +00:00
John McLear
85c68b1f51
rewrite author to actual author on changes
2013-04-07 16:28:28 +01:00
Siebrand Mazeland
5b1de1421c
Localisation updates from http://translatewiki.net .
2013-04-07 10:36:57 +00:00
John McLear
7492fb18a4
version bump
2013-04-06 14:29:21 +01:00
goldquest
cbf0535f97
browser detection was dropped in jquery 1.9, so we have to add the browser detection js file
2013-04-05 15:35:03 +02:00
Marcel Klehr
402a4b7b3e
html10n.js: Finally fix two-part locale specs
...
fixes #1706
2013-04-05 14:18:46 +02:00
John McLear
7cbce4543e
Merge pull request #1710 from ether/remove-chat-trans
...
no need for the language string on that div
2013-04-04 19:42:02 -07:00
John McLear
6dc4ddd29e
no need for the language string on that div
2013-04-05 03:38:47 +01:00
John McLear
883be3d48d
begin by adding some template css
2013-04-05 02:21:56 +01:00
Bernard `Guyzmo` Pratz
0e5a89becc
added full comments to the new API functions.
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-04 19:07:11 +02:00
Bernard `Guyzmo` Pratz
3df3b90bd9
fixed missing API functions declaration in API ; fixed a typo in APIHandler.
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-04 19:06:51 +02:00
John McLear
380821781f
dont use top, use the scheduler
2013-04-04 02:25:19 +01:00
mluto
c5b4e4934d
Kick the user if has already successfully authenticated but his session became invalid later
2013-04-03 11:19:26 +02:00
John McLear
5855e3d5bf
weird styling
2013-04-02 23:17:25 +01:00
John McLear
57a9ccbb88
whoops, comments hurt
2013-04-02 23:16:28 +01:00
John McLear
9e523191ea
whoops padid should be in payload..
2013-04-02 23:15:16 +01:00
John McLear
8b1a11d5d8
Merge pull request #1697 from ether/longer-timeout
...
Longer timeout
2013-04-02 12:00:07 -07:00
John McLear
56275d8de7
longer timeout on reconnection
2013-04-02 12:20:38 -07:00
Guyzmo
8f1348b40b
Added getAttributePool, getRevisionOfHead and getRevisionChangeset methods to API v1.2.8
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-01 17:19:48 +02:00
Marcel Klehr
04a53c4402
Merge branch 'feature/support-node-0.10' into develop
...
Conflicts:
src/package.json
2013-04-01 13:29:07 +02:00
Marcel Klehr
98f00e293c
Update ueberDB to add support for node 0.10.x
2013-04-01 13:27:06 +02:00
John McLear
0b2c67e998
Merge pull request #1691 from mluto/socketio-decode-cookie-session
...
Decode the sessionID before sending it to the server
2013-03-31 09:35:02 -07:00
mluto
1793e93ea1
Decode the sessionID before sending it to the server since our separator ',' gets encoded
2013-03-31 11:30:01 +02:00
mluto
911bfb30e4
Log when a sessionID in checkAccess is not found
2013-03-31 10:56:14 +02:00
mluto
30cae9097f
When there is just one session and this one is invalid SecurityManager.checkAccess would cause the request to hang forever because the callback is omitted for each invalid session, this fixes this issue.
...
validSession still remains false so this does not cause issues further down.
2013-03-31 10:27:21 +02:00
mluto
7e3b288afc
log things the log4js-way; put all the brackets on a new line
2013-03-30 20:46:56 +01:00
mluto
253a8e37fd
Added debug-output to SecurityManager.checkAccess to indicate *why* an auth-try failed.
2013-03-30 20:34:45 +01:00
John McLear
6a5e5cb6fd
Merge pull request #1640 from ether/caret-refactor
...
Caret refactor - I need help with tests...
2013-03-30 09:21:35 -07:00
Manuel Knitza
358b07390e
fix "util.pump() is deprecated. Use readableStream.pipe()"
...
fix error introduced by b3988e3
2013-03-30 15:42:10 +01:00
mluto
6af160ee56
Fix #1519 : don't error in listSessionsOfGroup when there are non-existing sessions (by eldiddio)
2013-03-29 10:09:39 +01:00
John McLear
f1b60e9867
Merge pull request #1677 from ether/ctrl-s-fade
...
show light yellow for .5 secs on save revision keypress
2013-03-28 20:11:30 -07:00
John McLear
c67c7ca746
remove messy bits
2013-03-29 03:09:10 +00:00
John McLear
406ff8e6f8
Merge pull request #1681 from ether/loading_block
...
Loading blocks
2013-03-28 20:01:46 -07:00
John McLear
d73ea4e334
Loading blocks
2013-03-29 02:24:15 +00:00
Marcel Klehr
0ff5137da3
Make revision button glow on ctrl-s and increase duration
2013-03-28 16:39:33 +01:00
John McLear
59a9ff404d
more settimeout to top window
2013-03-28 13:18:55 +00:00
John McLear
c489177206
show light yellow for .5 secs on save revision keypress
2013-03-28 02:24:59 +00:00
John McLear
c6041bf0c2
Merge pull request #1675 from ether/fix/process-uncaughtException-event-handler-leak
...
Don't leak event listeners for process:uncaughtException
2013-03-27 12:06:30 -07:00
John McLear
09b32ea694
Merge pull request #1672 from ether/feature/admin-plugins-revamp
...
/admin/plugins revamp
2013-03-27 12:05:00 -07:00
John McLear
2abb993e8b
Merge pull request #1607 from ether/custom-obj-msg
...
Custom Object messages
2013-03-27 11:50:56 -07:00
John McLear
40cbe55507
Update en.json
2013-03-27 14:11:20 +00:00
Marcel Klehr
cbee50d42d
/admin/plugins: Display a tooltip when hovering the plugin details link
2013-03-27 12:28:54 +01:00
Marcel Klehr
bc8d6d4c45
/admin/plugins: Add a loading indicator to some messages
2013-03-27 12:20:50 +01:00
Marcel Klehr
c4d9a71156
/admin/plugins: Fix update check
2013-03-27 12:02:19 +01:00
Marcel Klehr
ac0018cdfa
Don't leak event listeners for process:uncaughtException
2013-03-26 21:19:09 +01:00
John McLear
cee1ead8f6
Merge pull request #1664 from ether/sticky-chat
...
Option to enable Sticky chat from the chat dialogue
2013-03-26 13:12:01 -07:00
Marcel Klehr
d01a209cbf
/admin/plugins: Dry up displaying of info messages
2013-03-26 21:04:21 +01:00
Marcel Klehr
76c879bb47
/admin/plugins: Fix for smaller screens
2013-03-26 20:41:24 +01:00
Marcel Klehr
806926d0f6
/admin/plugins: If a user installs sth scroll up to the loading indicator
2013-03-26 19:54:23 +01:00
Marcel Klehr
4edb3b7ab3
/admin/plugins: Fix infinite scroll for larger screens
2013-03-26 19:32:15 +01:00
Marcel Klehr
2393dcd652
Disable search until registry is loaded and fix sorting by version
...
... and always display a scrollbar.
2013-03-26 19:22:04 +01:00
Marcel Klehr
f75a839cd0
Remove plugin prefix in pluin lists and make links to plugins more clear
2013-03-26 18:39:46 +01:00
Marcel Klehr
7edfff7574
/admin/plugins: Show some text if nothing is display otherwise
2013-03-26 16:23:47 +01:00
Marcel Klehr
638cea5fd6
Install and uninstall plugins with style
...
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile
Why? http://i.imgur.com/XoX6uYS.jpg
2013-03-26 15:11:30 +01:00
Marcel Klehr
981a33f01e
pluginfw/installer.js fire callbacks only once
2013-03-26 14:40:19 +01:00
Marcel Klehr
aca5d150e4
/admin/plugins: Don't list installed plugins as available
2013-03-26 11:58:31 +01:00
Marcel Klehr
511407241a
/admin/plugins: Make it display the same amount of plugins after sorting
2013-03-26 11:38:51 +01:00
Marcel Klehr
5d7a8adcb7
Silence npm when using npm.commands.search
2013-03-26 11:33:04 +01:00
Marcel Klehr
9109bd206e
Catch all errors in pluginfw/installer.js
2013-03-26 11:20:12 +01:00
Marcel Klehr
e8bae61cf5
/admin/plugins: Add progress indicators and report errors
2013-03-26 11:19:36 +01:00
John McLear
6b55d13370
expose ace document, reqjired for various plugins
2013-03-26 01:54:01 +00:00
Marcel Klehr
b35d9c14fd
/admin/plugins:Hide ep_etherpad-lite in the list of installed plugins
2013-03-25 23:52:10 +01:00
Marcel Klehr
773293991b
admin/plugins: Allow people to sort search results
2013-03-25 23:09:03 +01:00
Marcel Klehr
1ebbcd2f30
Don't leak event listeners in pluginfw/installer.js
...
fixes #921
2013-03-25 17:22:51 +01:00
Marcel Klehr
079fdf0f38
Revamp /admin/plugins
...
- dry up the client-side code
- use the new saner API of pluginfw/installer.js on the server
- Improve UX: allow user to infinitely scroll to display their results
2013-03-25 17:20:10 +01:00
Marcel Klehr
b297784288
Make npm registry access code more sane
2013-03-25 16:51:12 +01:00
Marcel Klehr
0070eab416
Fix caching of npm search results and only make one registry request on /admin/plugins
...
fixes #1488
2013-03-25 12:45:23 +01:00
Marcel Klehr
ef7fb5c7f0
Update npm
2013-03-25 12:18:06 +01:00
John McLear
2e7a9796de
option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title?
2013-03-24 01:12:01 +00:00
disy-mk
c78aad16ea
adds missing semicolons in src/node/utils folder
2013-03-24 01:18:44 +01:00
John McLear
d515acae96
expires was never defined
2013-03-23 18:01:44 +00:00
John McLear
b3988e30d5
pump isdeprecated
2013-03-23 17:55:34 +00:00
Siebrand Mazeland
35e4891217
Localisation updates from http://translatewiki.net .
2013-03-23 13:26:38 +00:00
John McLear
0063933041
fix cookies
2013-03-23 02:59:12 +00:00
Simon Gaeremynck
cbde18945c
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support.
2013-03-22 15:22:17 +00:00
Sahil Amoli
23abafb3cb
Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen
2013-03-20 15:48:11 -07:00
John McLear
4ea7ccd104
merge develop
2013-03-20 01:11:27 +00:00
John McLear
9d14c3708d
Merge pull request #1644 from ether/chatMsgHook
...
hook for chat msg
2013-03-19 18:10:31 -07:00
Marcel Klehr
bcb92f25a6
Refactor chat notifications and the chatNewMessage hook
2013-03-19 20:21:27 +01:00
John McLear
588fd399cd
Merge pull request #1645 from ether/fix/import-without-files
...
Don't break the whole server if an import failed because no files were u...
2013-03-19 10:41:32 -07:00
Marcel Klehr
c30697cb07
Don't break the whole server if an import failed because no files were uploaded
...
Fixes #1611
2013-03-19 18:40:39 +01:00
Marcel Klehr
a628317b55
Log http on debug log level
...
... and additionally log the response time
2013-03-19 18:34:21 +01:00
John McLear
a9bd081a44
more clean up
2013-03-19 16:55:42 +00:00
John McLear
9bb0587447
working and jsonify obj
2013-03-19 16:40:51 +00:00
John McLear
2916b39c24
make sure the sessionID target is right
2013-03-19 16:21:04 +00:00
Marcel Klehr
cb45c44b4d
Merge pull request #1588 from disy-mk/patch-2
...
fix #1586
2013-03-19 08:47:26 -07:00
John McLear
d0e656d0a6
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-19 13:59:07 +00:00
John McLear
7741f762e2
hook for chat msg
2013-03-19 02:21:53 +00:00
John McLear
07adb45503
Merge pull request #1643 from ether/fix/html10n-update
...
Update html10n.js
2013-03-18 14:38:22 -07:00
John McLear
e49620ea07
update ueber for pg
2013-03-18 21:36:50 +00:00
Marcel Klehr
b3dbf1c995
Update html10n.js
2013-03-18 22:29:42 +01:00
Marcel Klehr
2bc45de106
Fix #1639 by removing bodyParser middleware introduced with swagger REST API
2013-03-18 22:09:47 +01:00
John McLear
3562672a75
stop start point going negative
2013-03-18 18:44:01 +00:00
John McLear
27e9f91864
page up, down etc all working, still no shift page up/down for highlight but that never worked anyways
2013-03-18 18:03:37 +00:00
John McLear
9f54a65c88
refactored arrow keys now work after paste in chrome
2013-03-18 17:40:18 +00:00
Siebrand Mazeland
83ed9303da
Localisation updates from http://translatewiki.net .
2013-03-18 00:43:57 +00:00
John McLear
3e0a80cb74
remove console log
2013-03-17 15:17:36 +00:00
John McLear
693b9b9b94
better mobile support for gritter messages, before it was awful
2013-03-17 01:23:31 +00:00
John McLear
a1d9d27cde
much cleaner way of showing / hiding overlay
2013-03-16 17:57:23 +00:00
John McLear
69a4ab76cf
hide modal once reconnect is good
2013-03-16 17:50:53 +00:00
John McLear
13ad46aa67
a safer approach I think but still be careful
2013-03-16 13:19:12 +00:00
Marcel Klehr
cd9c78998e
Fix path.join in Settings.js
2013-03-16 09:47:10 +01:00
Marcel Klehr
54433db47f
release v1.2.9
2013-03-15 21:43:29 +01:00
Marcel Klehr
84d44d5f0e
Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets
...
Fix clearing authorship colors which was broken by #1609
2013-03-15 12:20:31 -07:00
Marcel Klehr
de552df6db
Fix clearing authorship colors which was broken by #1609
...
Fixes #1620
2013-03-15 18:08:51 +01:00
John McLear
ffe7e65db6
allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test
2013-03-14 19:03:20 -03:00
John McLear
cf041dcb08
Merge pull request #1618 from ether/tidy-up
...
Tidy up
2013-03-14 14:32:13 -07:00
John McLear
5d12be940c
return text instead of html
2013-03-14 18:28:35 -03:00
John McLear
383439629a
specialkey doesnt even exist afaik
2013-03-14 18:27:32 -03:00
John McLear
1bb9d1d625
remove pointless +
2013-03-14 18:23:27 -03:00
John McLear
d72abceee7
escape .color
2013-03-14 18:18:14 -03:00
John McLear
f0dee2d2ce
Merge pull request #1615 from ether/fix/admin-relative-links
...
redirect /admin to /admin/ so that the relative links work
2013-03-14 08:01:11 -07:00
John McLear
ac9b972358
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-14 12:01:09 -03:00
Marcel Klehr
5fe60e7221
redirect /admin to /admin/ so that the relative links work
2013-03-14 15:59:39 +01:00
John McLear
10231db103
Merge pull request #1609 from ether/dont-crash-bad-author
...
SECURITY PATCH: Don't crash pad if bad author data is passed to the server
2013-03-13 16:08:21 -07:00
Marcel Klehr
c30b0b72b8
Validate all 'author' attribs of incoming changesets to be the same value as the current user's authorId
2013-03-13 22:23:35 +01:00
John McLear
babb33d825
add authorId to chat and userlist, possibly privacy/security issue?
2013-03-13 21:55:29 +01:00
cohitre
988653b8ce
Toolbar hooks
2013-03-12 19:36:04 -07:00
John McLear
83a820b720
new function for handling custom messages, allows objects to be sent, before we only allowed strings
2013-03-12 16:59:15 +00:00
Siebrand Mazeland
acb4b4ebaf
Localisation updates from http://translatewiki.net .
2013-03-11 04:52:12 +00:00
cohitre
52aa7d3997
Registering commands on the ace toolbar
2013-03-10 15:42:12 -07:00
cohitre
292a3bd7b7
Setting up the right toolbar.
2013-03-09 14:57:42 -08:00
John McLear
26a6765b50
fix indent on chrome in linux
2013-03-08 08:40:40 -08:00
John McLear
0b16d96c97
Merge pull request #1527 from nelsonsilva/swagger
...
Initial work on new swagger based REST API
2013-03-07 08:07:46 -08:00
Jordan Hollinger
3cafa24982
Fix variable name typo in PadMessageHandler.padUsers
2013-03-07 09:37:03 -05:00
John McLear
0c9214bb27
bump v and changelog
2013-03-06 15:08:27 +00:00
John McLear
1e94eaa06c
fix safari rtl dissapearing pad
2013-03-06 14:50:08 +00:00
Marcel Klehr
5731ef7802
Fix ace rtlIsTrue property setter
2013-03-06 15:40:02 +01:00
John McLear
2a8038b9fe
Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting
...
Add a setting for RTL text direction (integrating the url paramter)
2013-03-06 05:58:47 -08:00
nelson.silva
a5987285e0
Multiple REST endpoints (one per version)
2013-03-06 10:10:21 +00:00
Nelson Silva
8f279a6710
Added some fixes to make it work with the codegen
2013-03-06 10:10:21 +00:00
Nelson Silva
1cfc8eda19
Initial work on swagger
2013-03-06 10:10:21 +00:00
Marcel Klehr
760e1b82c3
Add a setting for RTL text direction (integrating the url paramter)
...
Fixes #1191
2013-03-05 23:12:00 +01:00
John McLear
f9f8b1c079
allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway
2013-03-05 20:30:31 +00:00
Manuel Knitza
67a0730710
added nodemailer to package.json - fix #1586
2013-03-05 21:28:38 +01:00
John McLear
3dee4098b0
update ueberdb
2013-03-05 13:24:24 +00:00
Siebrand Mazeland
6c304f0480
Localisation updates from http://translatewiki.net .
2013-03-04 11:46:05 +00:00
cohitre
c57bc444cd
basic toolbar setup
2013-03-03 16:06:14 -08:00
John McLear
71f10bff5b
Merge pull request #1568 from ether/client-stability
...
stop the client disconnecting of the server sends out a bad revision #, ...
2013-03-03 13:19:10 -08:00
Marcel Klehr
c4966543ed
Fix settings object having constructors of another vm.context
...
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
2013-02-28 16:16:26 +01:00
John McLear
994c4ebeed
stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510
2013-02-27 19:29:59 +00:00
John McLear
ebd8b85072
patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution
2013-02-27 16:17:50 +00:00
John McLear
18b6cf1534
Merge pull request #1523 from ether/store-sessions-in-db
...
Store sessions in db
2013-02-26 18:03:54 -08:00
John McLear
2c69066591
remove pointless stuff
2013-02-27 02:02:18 +00:00
John McLear
ad52b40597
post correct url, heh
2013-02-26 13:24:24 +00:00
John McLear
b2eb1b3814
post url with pad error msg
2013-02-26 13:14:17 +00:00
John McLear
f915285f15
merge develop
2013-02-25 10:13:50 +00:00
John McLear
5b89242c5b
Merge pull request #1538 from ether/timeslider-init-hook
...
timeslider init hook
2013-02-25 02:12:37 -08:00
Siebrand Mazeland
26ccb1fa3e
Localisation updates from http://translatewiki.net .
2013-02-24 16:38:27 +00:00
John McLear
4a98ec3c23
resolve merge conflict
2013-02-20 22:37:27 +00:00
John McLear
fb3e4a6232
only show clients on this pad resolves issue #1544
2013-02-20 16:10:27 +00:00
John McLear
e52dc2b17c
dont reset head count, use the one we should :)
2013-02-19 02:05:51 +00:00
John McLear
9eff8576ef
timeslider init hook
2013-02-18 22:04:58 +00:00
John McLear
cda3a0e78b
a different approach
2013-02-18 21:03:52 +00:00
John McLear
c986a8565a
Merge pull request #1535 from ether/fix-extractPadData
...
fix extract and checkPad
2013-02-18 12:41:46 -08:00
Marcel Klehr
4592397bd9
Merge pull request #1491 from ether/export-txt-with-indent
...
TXT Export Indentation on lists Edit
2013-02-18 12:13:06 -08:00
John McLear
ab81b5cfe9
dont jump pages
2013-02-18 19:46:31 +00:00
John McLear
5441179e78
dont jump pages
2013-02-18 19:38:25 +00:00
John McLear
1a177d730a
Merge pull request #1536 from ether/timeslider-scripts-block
...
Timeslider scripts block
2013-02-18 11:34:53 -08:00
John McLear
e7a07a495c
Merge pull request #1531 from ether/fix-for-long-strings
...
make the focus jump back to the left if it's required
2013-02-18 11:26:46 -08:00
John McLear
2ee3d0469e
Merge pull request #1533 from ether/indenting-text
...
Indenting text
2013-02-18 11:25:55 -08:00
John McLear
7fcc71710f
dont exposrt sendSocketMs
2013-02-18 18:59:53 +00:00
John McLear
75fd27998e
expose socket timeslider with a bad hack
2013-02-18 18:58:58 +00:00
John McLear
3f87a32a12
timestlider script block
2013-02-18 18:07:01 +00:00
John McLear
4cfac2f624
fix extract and checkPad
2013-02-18 08:29:25 -08:00
John McLear
77d03d3473
Try to add some sanity to indentation
2013-02-18 01:40:34 +00:00
John McLear
48ffbde731
allow colon to indent line
2013-02-18 01:10:54 +00:00
John McLear
eeeeb04840
remove cruft
2013-02-18 00:37:47 +00:00
John McLear
6e46a53288
this is probably bad, please sanity check
2013-02-18 00:36:31 +00:00
John McLear
11a8295150
eureka
2013-02-18 00:29:53 +00:00
John McLear
6d7e709ecb
Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db
2013-02-17 23:44:26 +00:00
John McLear
51a9ecf1f0
better support for other browsers
2013-02-17 21:19:15 +00:00
John McLear
7e023ce8e1
make the focus jump back to the left if it's required
2013-02-17 21:03:19 +00:00
Marcel Klehr
9ca2275432
Fixes #1498 : Two-part locale specs in lang cookie wouldn't be read correctly
2013-02-17 21:35:46 +01:00
John McLear
04f609752f
actually works
2013-02-17 18:05:25 +00:00
John McLear
6b47fb69d0
seems to be working pretty well
2013-02-17 18:01:25 +00:00
John McLear
93d58b93be
Update src/static/css/iframe_editor.css
2013-02-17 17:13:02 +00:00
Siebrand Mazeland
025a3aa724
Localisation updates from http://translatewiki.net .
2013-02-16 05:10:29 +00:00
John McLear
140ff6f1bf
dont lose focus on key up, doesn't work yet
2013-02-15 12:24:16 +00:00
John McLear
7c03bc2610
when exporting HTML include html and body
2013-02-14 01:13:23 +00:00
John McLear
c723aefdfe
when exporting HTML include html and body
2013-02-14 01:10:47 +00:00
John McLear
36814ed42b
apply overlay and remove overlay instantly
2013-02-13 23:44:20 +00:00
John McLear
7f09ec25a2
no need for prefix and tidy double semi
2013-02-13 21:53:15 +00:00
John McLear
efce99c3a1
session key in settings file OR generate temp key for instance
2013-02-13 21:51:09 +00:00
John McLear
aefd8d8d0d
nice chars n no cruft
2013-02-13 18:45:45 +00:00
John McLear
dea892213e
Revert "allow non ascii chars in txt export"
...
This reverts commit be56272e66
2013-02-13 18:41:04 +00:00
John McLear
be56272e66
allow non ascii chars in txt export
2013-02-13 18:30:55 +00:00
John McLear
d3f730e2ba
fix various issues dont stop random *'s appearing
2013-02-13 18:01:15 +00:00
Mark Fisher
500f9b8b48
Fixed typo thats made server hang
2013-02-13 15:25:27 +00:00
Marcel Klehr
602d603658
Merge pull request #1512 from disy-mk/patch-3
...
Allow people to query current API version via /api
2013-02-13 03:39:32 -08:00
John McLear
a4e5adab3e
Update Ueber DB to fix MySQL Bug!
2013-02-13 02:47:24 +00:00
John McLear
5c9d081391
Begin supporting the database but still have a problem where it generates new key on restart...
2013-02-13 01:33:22 +00:00
John McLear
198110eb4b
drunk comments
2013-02-12 23:49:43 +00:00
John McLear
e152c477c7
include the callback call, for sanity and stop the pad from being nuked so early in the function
2013-02-12 23:38:02 +00:00
John McLear
086132de66
dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad
2013-02-12 23:23:44 +00:00
Manuel Knitza
8c9ad6ee50
Update src/node/handler/APIHandler.js
2013-02-12 21:50:14 +01:00
Manuel Knitza
e855bafdf9
Update src/node/hooks/express/apicalls.js
2013-02-12 21:47:40 +01:00
John McLear
da246d183d
Correct license header
2013-02-12 19:47:53 +00:00
John McLear
0b5c948549
Move code from Html export to a Helper file
2013-02-12 19:45:46 +00:00
John McLear
14dca92692
Merge pull request #1505 from ether/fix-for-long-strings
...
very simple fix that might break other things but stops the caret focus ...
2013-02-12 11:06:45 -08:00
John McLear
760bebc429
Merge pull request #1507 from ether/ace2_inner-fix
...
fix issue where opera was doing stupid things but still an issue w/ doub...
2013-02-12 11:06:25 -08:00
John McLear
a37d396577
fix issue where opera was doing stupid things but still an issue w/ double tabs exists
2013-02-12 19:04:43 +00:00
John McLear
9c54f024aa
Bump to latest ueber to support sqlite
2013-02-12 13:15:57 +00:00
John McLear
2f20461445
a comment
2013-02-12 00:13:47 +00:00
John McLear
5f73a5ec30
very simple fix that might break other things but stops the caret focus being moved to the end of new lines when a long string without spaces is pasted into a pad
2013-02-12 00:08:44 +00:00
John McLear
24485283fd
Merge pull request #1504 from ether/feature/bringJqueryBack
...
Checked JQuery back in. Temporary fix for #1499
2013-02-11 14:05:31 -08:00
Peter 'Pita' Martischka
b76e49ecde
Checked JQuery back in. Temporary fix for #1499
2013-02-11 21:22:16 +00:00
Peter 'Pita' Martischka
0953a5ac33
Brought scheduler back completly, fixes #1502
2013-02-11 20:51:40 +00:00
Manuel Knitza
b1586684c8
Explicitly log creation of pad
2013-02-11 03:03:18 +01:00
John McLear
60ef5f210a
remove duplicate code to the best of my ability right now
2013-02-10 23:41:14 +00:00
John McLear
1a77e57503
Merge pull request #1487 from ether/dep-cleanup
...
Dependancy cleanup
2013-02-10 15:19:20 -08:00
Peter 'Pita' Martischka
17a02bb024
Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup
2013-02-10 22:41:49 +00:00
Peter 'Pita' Martischka
b0f555e669
Revert "no longer dep on npm as it's native"
...
This reverts commit 85f18d1f92
2013-02-10 22:26:39 +00:00
John McLear
28f6d50011
remove console warn
2013-02-10 22:14:05 +00:00
Peter 'Pita' Martischka
25fd3c5901
Windows and Mobile tests should be case insensitive
2013-02-10 22:10:25 +00:00
Peter 'Pita' Martischka
8d8487dfa6
Made jquery browser usable in testframework
2013-02-10 21:49:00 +00:00
John McLear
bd33061c8a
Merge pull request #1492 from ether/feature/cleanup
...
Several code cleanups
2013-02-10 13:38:26 -08:00
Peter 'Pita' Martischka
1fbd408e82
replaced opera regex check with jquery browser check
2013-02-10 21:21:22 +00:00
Peter 'Pita' Martischka
500c451ba1
removed hack, because its uncessary now that scheduler is back
2013-02-10 21:19:48 +00:00
John McLear
d7992a1366
begin putting files together for a release
2013-02-10 21:13:51 +00:00
Peter 'Pita' Martischka
5e041aaedb
Moved old jquery recognition to seperate file
2013-02-10 20:34:27 +00:00
Peter 'Pita' Martischka
60de52477c
jquery shouldn't be checked in
2013-02-10 20:14:13 +00:00
John McLear
bcf9c23b4e
dont use HTML filter hooks on txt export
2013-02-10 19:38:16 +00:00
John McLear
626ee97669
kinda brutal way of stopping plugins being able to pass *s instead of attributes
2013-02-10 19:36:46 +00:00
John McLear
a67a0950dd
stop urls being encoded, not sure about other security implications here...
2013-02-10 19:21:27 +00:00
Siebrand Mazeland
5248dac016
Localisation updates from http://translatewiki.net .
2013-02-10 19:15:11 +00:00
John McLear
69a6d5468e
a bit fairer
2013-02-10 17:53:17 +00:00
John McLear
a378f48c00
remove console warns
2013-02-10 17:39:02 +00:00
John McLear
d16b15f3eb
begin support for better txt output
2013-02-10 17:34:34 +00:00
Marcel Klehr
6d2b1488d6
Reformat access log messages to improve readability
2013-02-10 16:14:48 +01:00
John McLear
3760b97170
Merge pull request #1489 from marcelklehr/feature/log-client-ips
...
Log the client ip on pad access
2013-02-10 07:09:56 -08:00
Marcel Klehr
ee89696c4d
Log the client ip on pad access with logger 'access'
...
also, don't log every message with log level info!
2013-02-10 16:03:49 +01:00
John McLear
2634e8120a
Merge pull request #1485 from ether/readme-placeholder
...
remove one less warning during install by having a readme placeholder
2013-02-10 05:59:33 -08:00
Marcel Klehr
6191b01633
Merge pull request #1477 from ether/fix-opera-double-enter
...
Fixes #940 : opera double enter
2013-02-10 05:10:38 -08:00
John McLear
85f18d1f92
no longer dep on npm as it's native
2013-02-10 03:39:20 +00:00
John McLear
f617cefe54
no need for jshint and update wd
2013-02-10 03:30:08 +00:00
John McLear
8f2025067b
remove one less warning during install by having a readme placeholder
2013-02-10 03:04:08 +00:00
John McLear
98d45af0f9
Merge pull request #1484 from disy-mk/develop
...
jquery update 1.7.1 -> 1.9.1
2013-02-09 18:18:40 -08:00
Manuel Knitza
7b3d567d0c
.browser() support
...
Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)
2013-02-10 02:53:07 +01:00
John McLear
cd77f3e637
Merge pull request #1483 from 0ip/ua
...
Add UA functions
2013-02-09 17:47:34 -08:00
Manuel Knitza
7389e90cd0
update jquery 1.7.1 -> 1.9.1
2013-02-10 02:37:17 +01:00
0ip
c3a29d1480
Add missing export entry for the browser object
2013-02-09 22:35:10 +01:00
0ip
7ddfdc3935
Add UA functions
2013-02-09 22:26:47 +01:00
0ip
8a6b3c90e2
Fix loader styling
2013-02-09 21:29:11 +01:00
0ip
8fb8f0d3b6
Change settings layout
2013-02-09 21:22:23 +01:00
0ip
40734e6776
Fix table CSS
2013-02-09 20:58:57 +01:00
0ip
ad54369bf1
Add doctype
2013-02-09 20:57:41 +01:00
John McLear
a45a8a837d
stop opera doing stupid things
2013-02-09 19:44:13 +00:00
0ip
21e1422be6
Drop 'lite' occurrences in /admin/*
2013-02-09 20:42:47 +01:00
0ip
52ff28dea0
Fix data attribute
2013-02-09 20:34:12 +01:00
0ip
d2409288be
Add data-title for responsive tables
2013-02-09 20:15:41 +01:00
0ip
34fd7726bd
Fix :admin/index links
2013-02-09 17:55:11 +01:00
0ip
b04e99bddc
Tweak admin-UI
2013-02-09 17:54:39 +01:00
0ip
dd29096ad7
Normalize view-ports
2013-02-09 17:47:52 +01:00
John McLear
a93ff37879
fix opera by recreating a scheduler object
2013-02-09 16:42:47 +00:00
0ip
ef0a6ce5ff
Remove top-border
2013-02-09 17:39:08 +01:00
Marcel Klehr
5f79546c2a
Merge pull request #1465 from mluto/kill-ep-stuff
...
Removing old etherpad code
2013-02-08 13:21:57 -08:00
mluto
f2cd9e3adc
Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this.
2013-02-08 22:06:28 +01:00
mluto
e6454af5ed
Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP
2013-02-08 22:00:17 +01:00
mluto
fc60ab24fa
Removed debug code, moved hash-setting after the param-checking
2013-02-07 15:34:10 +01:00
mluto
0d5b98a338
Removed isProPad, since all pads are public except for group-pads
2013-02-07 14:30:09 +01:00
mluto
0cbd4034b1
Killed pad_docbar.js as it's from the old etherpad and not used
2013-02-07 13:59:41 +01:00
mluto
6e8dcee650
Removed old chat-code
2013-02-07 11:15:16 +01:00
John McLear
e78879c300
Merge pull request #1461 from ether/slider-nan
...
stop slider showing NaN on tiny pads
2013-02-06 15:45:39 -08:00
John McLear
488ebc20a4
Merge pull request #1446 from ether/allow-plugins-to-specify-specs
...
Allow plugins to specify specs
2013-02-06 15:43:39 -08:00
John McLear
284748adb7
stop slider showing NaN on tiny pads
2013-02-06 23:35:58 +00:00
John McLear
adaded343d
better fix for IE8 page up down
2013-02-06 20:09:30 +00:00
root
9fcabfa8ac
fix IE8 styling y u no do this 0ip?
2013-02-06 20:02:24 +00:00
John McLear
dd49c71af9
fixes IE8 error by only redifining if firefox
2013-02-06 19:43:28 +00:00
John McLear
5b31030958
Merge pull request #1454 from dmitryuv/feature/socketio-rooms
...
socket.io rooms instead of own session management
2013-02-05 16:09:25 -08:00
Dmitry
34f9f15150
socket.io rooms instead of own session management
...
Replaces homegrown pad session management with socket.io build-in rooms
2013-02-05 23:33:44 +04:00
Jordan Hollinger
718421a46d
Bugfixes to getChatHistory API method
2013-02-04 00:57:51 -05:00
John McLear
da0b331502
Make async and cleaner
2013-02-04 00:00:39 +00:00
Peter 'Pita' Martischka
eaa835630c
Support Page Up and Page Down in ace
2013-02-03 17:39:49 +00:00
Peter 'Pita' Martischka
cba001341f
Remove legacy mozilla specific code from ace inner
2013-02-03 14:03:10 +00:00
John McLear
8b8cf01785
put tests in static folder, still have a race condition no biggy
2013-02-03 13:53:44 +00:00
Peter 'Pita' Martischka
d30daccb10
Don't handle selections that are not from the inner frame
2013-02-03 13:44:37 +00:00
John McLear
0ff9f53297
correct path
2013-02-03 00:18:24 +00:00
John McLear
594d272334
allow plugins to specify frontend test specs
2013-02-03 00:14:17 +00:00
Manuel Knitza
b9b5ebf661
Update src/static/js/html10n.js
...
Added missing semicolons (#1440 )
2013-02-01 21:28:22 +01:00
John McLear
f8cc7e0d7b
Merge pull request #1438 from mluto/plugin-search-case-senstive
...
Made plugin search not casesensitive
2013-01-31 10:13:37 -08:00
mluto
037478cbcd
Made plugin search not casesensitive
2013-01-31 19:05:23 +01:00
Swen
360d5c150b
Update html code to proper validate
2013-01-30 20:24:48 +01:00
Swen
7f5579c2ed
Reverted change
2013-01-30 20:21:21 +01:00
Swen
1f348d911f
Merge branch 'develop' into admin-index-plugable
2013-01-30 20:16:51 +01:00
Swen
621a410750
Merge remote-tracking branch 'ether_origin/develop' into develop
2013-01-30 20:08:53 +01:00
John McLear
594d53ee8b
changelog and package file
2013-01-30 14:58:23 +00:00
John McLear
037ca9b3fd
Merge pull request #1432 from mluto/rename-save-revision
...
Renamed "Saved Revisions" to "Save Revision"
2013-01-30 06:47:10 -08:00
mluto
d669779eb8
Renamed "Saved Revisions" to "Save Revision" since it saves a revision..
2013-01-30 15:45:48 +01:00
John McLear
1814c756ad
Merge pull request #1431 from mluto/fix-userinfo-crash
...
Fix USERINFO_UPDATE crash
2013-01-30 06:43:37 -08:00
John McLear
5b285e2ffa
Merge pull request #1430 from mluto/notification-on-startup
...
Don't show notifications when loading the chat-messages.
2013-01-30 06:33:47 -08:00
mluto
7e48e025c7
Check for missing payload on CLIENT_MESSAGE
2013-01-30 15:28:54 +01:00
mluto
f2742c5b63
Check for missing userInfo
2013-01-30 15:21:25 +01:00
mluto
b5eeeb7dc2
Don't show notifications when loading the chat-messages.
2013-01-30 12:16:32 +01:00
John McLear
edd8b12049
push authorID to author object and return via api...
2013-01-29 16:45:09 +00:00
John McLear
daaa650a1b
remove message about requiring comments
2013-01-29 12:15:11 +00:00
John McLear
a7361f5ce0
make tinycon update on all chat messages not just ones that mention your name
2013-01-29 12:09:16 +00:00
John McLear
fa7952523e
spacing
2013-01-29 02:08:37 +00:00
John McLear
1c7810783c
gritter now implemented
2013-01-29 01:55:36 +00:00
John McLear
2ae3dae492
introduce gritter files and ensure its available
2013-01-29 00:46:36 +00:00
John McLear
c6f997981b
Merge pull request #1417 from ether/diff-view
...
Adds an API endpoint for Diff view
2013-01-28 13:50:31 -08:00
John McLear
e1cd34763d
Merge pull request #1418 from mluto/timeslider-jump-revisions
...
Jump to revisions in timeslider
2013-01-28 13:29:47 -08:00
mluto
01fe5c183d
Only set url if the revsion will actually be loaded
2013-01-28 21:44:21 +01:00
Marcel Klehr
dcff3bddda
Merge pull request #1413 from mluto/clean-getParams
...
Rewrote getParams() to be more dynamic and shorter
2013-01-28 12:03:31 -08:00
mluto
a239158b49
Renamed paramSettings to getParameters, to cause less confusion
2013-01-28 20:17:34 +01:00
John McLear
51eff0d659
change to createDiffHTML
2013-01-28 16:53:29 +00:00
John McLear
4378561882
change to createDiffHTML
2013-01-28 16:52:23 +00:00
mluto
f974136d0c
Jump to revision given in URL, add current revision to URL
2013-01-28 10:13:37 +01:00
spcsser
80333d8e0a
Added ability to add menu entries for admin pages.
2013-01-27 23:02:27 +01:00
Siebrand Mazeland
75b861e93b
Localisation updates from http://translatewiki.net .
2013-01-27 19:41:00 +00:00
John McLear
3fac18f88a
resolve merge conflict
2013-01-27 17:54:26 +00:00
John McLear
ed5644d4e5
docs
2013-01-27 17:51:40 +00:00
Peter 'Pita' Martischka
878fd7631c
Fixed HTML export
2013-01-27 17:25:50 +00:00
Peter 'Pita' Martischka
07a267be7a
Added colors to pad diff
2013-01-27 16:45:09 +00:00
Peter 'Pita' Martischka
dcfb1b2ea4
Added missing functions to create pad diffs
2013-01-27 15:40:37 +00:00
Peter 'Pita' Martischka
f4690dda9d
fixed indent
2013-01-27 15:40:05 +00:00
mluto
7432b7aff9
Rewrote getParams() to be more dynamic and shorter
2013-01-27 11:02:15 +01:00
John McLear
e811037300
Merge pull request #1411 from ether/feature/plugin-update-checker
...
plugin update checker
2013-01-26 13:36:11 -08:00
Marcel Klehr
541aeb3a98
/admin/plugins: Display an update button for all plugins that are outdated
2013-01-26 22:15:19 +01:00
Marcel Klehr
0549a4fec7
Add checkUpdates endpoinnt for /admin/plugins
2013-01-26 22:13:28 +01:00
John McLear
1290fa36c3
typo fix
2013-01-26 20:05:37 +00:00
John McLear
9d0672c1c8
not a perfect css fix but stops the overflow when screen is less than 1000px
2013-01-26 20:04:33 +00:00
John McLear
090508909e
Merge pull request #1389 from ether/disconnect-eejs-block
...
add eejs block for disconnect
2013-01-26 09:06:53 -08:00
John McLear
0ccd1a30e9
Merge pull request #1390 from ether/html-head-block-eejs
...
add a html block eejs so you can add a cache manifest
2013-01-26 09:06:38 -08:00
John McLear
51daaf02ce
Merge pull request #1407 from mluto/hardcoded-i18n
...
i10ze hardcoded message, update some messages on lang-change
2013-01-26 07:19:04 -08:00
mluto
cb2b93b133
Added getChatHistory and getChatHead (api+code+doc)
2013-01-26 14:35:26 +01:00
mluto
046fac9fa9
Added a comment to clearify *why* this works
2013-01-25 20:38:24 +01:00
mluto
763864539f
Use 'html10n' instead of '_', i10nzed "unnamed author(s)"
2013-01-25 17:41:33 +01:00
mluto
4a20a26cbf
Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n
2013-01-25 17:14:56 +01:00
mluto
509f564cd7
re-formated onelined en.json
2013-01-25 17:06:57 +01:00
Marcel Klehr
2841bfc009
Merge branch 'feature/real-time-plugin-search' into develop
2013-01-25 14:50:51 +01:00
mluto
7812d93e74
Fixed "unnamed" and "enter your name" in userlist
2013-01-25 10:32:09 +01:00
John McLear
568b641ee9
Merge pull request #1404 from ether/feature/real-time-plugin-search
...
real-time plugin search
2013-01-24 14:09:30 -08:00
Marcel Klehr
3e793b8a63
[/admin/plugins] remove progress history
2013-01-24 23:00:56 +01:00
Marcel Klehr
23dd4c73e2
pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message
2013-01-24 22:40:31 +01:00
Marcel Klehr
fa55cd4759
[/admin/plugins] Add real-time on keypress search
...
also, I reduced the size of the activity indicator
2013-01-24 22:39:52 +01:00
John McLear
1f7140345a
index wrapper block
2013-01-24 20:03:07 +00:00
John McLear
ccc06b08ee
Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu
...
Add a unified menu to all admin pages
2013-01-24 10:00:58 -08:00
Marcel Klehr
7c06dc750c
Unify admin page titles
2013-01-24 18:46:32 +01:00
Marcel Klehr
2eccaa2afd
Add a uniform menu to all admin pages
2013-01-24 18:46:15 +01:00
John McLear
569fb8d3c8
silly little bug now resolved
2013-01-24 16:48:40 +00:00
John McLear
18b96b33c6
Merge pull request #1379 from ether/more-plugin-details
...
resolve #1349 - add url to plugin name
2013-01-24 07:29:30 -08:00
Marcel Klehr
3719ce7c5d
[admin] Make links prettier
2013-01-24 13:50:49 +01:00
Marcel Klehr
9fa5b9506e
Add links for installed plugins
2013-01-24 13:43:42 +01:00
John McLear
28aa1ecc24
Merge pull request #1398 from marcelklehr/fix/html10n-ie8-array.indexOf
...
Fix Array.prototype.indexOf for IE8! <3
2013-01-23 08:49:15 -08:00
Marcel Klehr
25e1ed2d0c
Fix Array.prototype.indexOf for IE8! <3
2013-01-23 17:40:10 +01:00
goldquest
74185e79ab
use the existing padimpexp object from the parent window
2013-01-23 16:36:37 +01:00
John McLear
9129c6970a
add a html block eejs so you can add a cache manifest
2013-01-23 02:46:57 +00:00
John McLear
b76f084f3a
add eejs block for disconnect
2013-01-23 01:01:35 +00:00
John McLear
f1b9c213ee
and semi working
2013-01-22 23:37:53 +00:00
John McLear
3fb2f02875
semi working
2013-01-22 23:16:49 +00:00
John McLear
d21585b880
mheh
2013-01-22 23:06:52 +00:00
John McLear
205d983225
make it crash
2013-01-22 22:48:05 +00:00
John McLear
5d416579ee
bring in some padDiff stuff that doesnt suck
2013-01-22 22:33:51 +00:00
John McLear
6ae46ea8e3
fix issue where url was wrong for install
2013-01-22 18:28:38 +00:00
John McLear
159feceb20
fix import without params
2013-01-22 18:17:15 +00:00
John McLear
c6882aa65a
Merge pull request #1386 from ether/fix-import-on-params
...
fix issue #1369 where params would break import
2013-01-22 08:05:04 -08:00
John McLear
e23108d199
fix issue #1369 where params would break import
2013-01-22 16:03:00 +00:00
goldquest
666c0adcd2
script tag didn't link to right location
2013-01-22 16:42:56 +01:00
Siebrand Mazeland
7869a543dd
Localisation updates from http://translatewiki.net .
2013-01-22 06:14:31 +00:00
John McLear
441dd3785a
fix issue #1110
2013-01-20 23:11:59 +00:00
John McLear
8bfa8a7e73
better urls
2013-01-20 22:42:32 +00:00
John McLear
4cbf3869c6
open in external window
2013-01-20 22:36:58 +00:00
John McLear
1bf526124d
resolve #1349
2013-01-20 22:34:27 +00:00
John McLear
4b5d993f0d
bump v and create CHANGELOG
2013-01-20 13:45:16 +00:00
John McLear
b282547dbf
Merge pull request #1376 from t-8ch/patch-2
...
listAllPads needs findKeys from ueberDB 0.1.9
2013-01-20 05:42:44 -08:00
John McLear
0a06b07f7d
Merge pull request #1377 from mluto/add-users-block
...
Added a template block for #users
2013-01-20 05:35:19 -08:00
mluto
9c364d7d38
Added a template block for #users
2013-01-20 13:56:51 +01:00
Thomas Weißschuh
9ee5098ad6
listAllPads needs findKeys from ueberDB 0.1.9
2013-01-19 19:17:52 +00:00
Jordan Hollinger
858d8e6e71
listAllPads should return an object, not an arraay. issue #1374
2013-01-18 11:13:03 -05:00
John McLear
96989e63c7
prepare for release
2013-01-18 13:30:46 +00:00
Marcel Klehr
a1188c15c0
[html10n] Fix onload event listener (must be attached to window!)
2013-01-16 19:47:54 +01:00
mluto
e31b9fd1bd
IE8 does not have a string.trim()-function, so use regex..
2013-01-16 18:48:25 +01:00
John McLear
5eb09f981b
Merge pull request #1358 from mluto/clientvars-hook
...
Make the creation of clientVars hookable
2013-01-14 14:26:30 -08:00
John McLear
bb9097e528
Merge pull request #1355 from mluto/chat-no-empty-line
...
prevent empty chat-messages from being sent
2013-01-14 14:25:46 -08:00
mluto
27c5498c54
Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys
2013-01-14 23:22:12 +01:00
mluto
41cb5d8265
Added hook for clientVars and hook-doc
2013-01-14 22:51:26 +01:00
mluto
94f9b05c4c
Only create clientVars when they are needed
2013-01-14 22:08:33 +01:00
Swen
96b7b5e8d0
Removed unnecessary return statement
2013-01-14 21:12:40 +01:00
John McLear
654654b4e1
Merge pull request #1342 from spcsser/feature/padlisting
...
API & backend to list pads on epl instance
2013-01-14 08:13:57 -08:00
mluto
77401f2759
prevent empty chat-messages from being sent
2013-01-14 17:11:56 +01:00
John McLear
1e7bcdba59
more sensible timeslider blocks..
2013-01-14 03:42:09 +00:00
John McLear
33e0ec2097
Merge pull request #1334 from mluto/load-more-chat-messages
...
Load more than 100 chat messages using a 'load more'-link
2013-01-13 10:31:45 -08:00
John McLear
6104987a4b
Merge pull request #1353 from ether/feature/log4js-config-setting
...
Add log4js config setting
2013-01-13 10:28:15 -08:00
John McLear
0bcfef5aa4
Merge pull request #1352 from ether/timeslider-eejs
...
add a body eejs block to timeslider
2013-01-13 10:27:50 -08:00
John McLear
eb0338d40c
better shindig
2013-01-13 18:23:35 +00:00
Siebrand Mazeland
f8d6ffa22a
Localisation updates from http://translatewiki.net .
2013-01-13 15:01:03 +00:00
Marcel Klehr
f4b95c5ca4
Add log4js config setting
2013-01-13 12:20:49 +01:00
John McLear
e137919c3d
add a body eejs block to timeslider
2013-01-12 23:51:35 +00:00
0ip
2786807f2f
Fix broken relative paths
...
Bug introduced in 53521c8732
2013-01-12 18:41:56 +01:00
spcsser
9687ecbb82
Modified pad list manager to return an ordered list.
2013-01-11 18:31:53 +01:00
Swen
e9726890a4
Edited getPads function to be able to work without callback
2013-01-11 04:43:59 +01:00
John McLear
730266256c
fix #1341 by adding css to stop highlighting
2013-01-10 15:14:10 +00:00
Marcel Klehr
7a62661705
Merge pull request #1346 from ether/fix-timeslider-date-not-changing
...
fix #1345 : timeslider time delta
2013-01-10 04:50:12 -08:00
John McLear
ac448937ab
fix egils fix of time delta resolves #1345
2013-01-10 00:01:38 +00:00
Swen
c9f137b2e5
Added functionality to use spcsser/ueberDB findKey functionality.
2013-01-09 20:45:39 +01:00
Swen
7a49c82e16
Added comments
2013-01-08 20:21:14 +01:00
Swen
8c3263a6ea
Added comments
2013-01-08 20:19:10 +01:00
Swen
198754222d
Added functionality to list pads on this server.
2013-01-08 20:14:01 +01:00
John McLear
fadfa6772e
changelog and package file
2013-01-07 19:31:29 +00:00
Marcel Klehr
e6d523ba1c
Merge pull request #1317 from ether/enter-on-plugins
...
/admin/plugins: stop enter reloading new page on search result request
2013-01-07 10:46:05 -08:00
Oscar Perez
f00dddd09c
Moved console existence check before the variable is used. This was causing a crash in Internet Explorer when the console was not enabled (console is off by default).
2013-01-07 13:24:40 -05:00
mluto
bc05f9eb0a
converted load-more-link to button, added loading-gif, fixed typo
2013-01-07 19:15:55 +01:00
mluto
825b258d99
only load 20 messages when pressing the load-link, fixed whitespace
2013-01-07 17:43:03 +01:00
mluto
5f81daed0a
Added link to load more chat-messages using new GET_CHAT_MESSAGES
2013-01-07 17:36:03 +01:00
John McLear
8e366da82e
use .val() instead of [0]
2013-01-07 11:27:40 +00:00
Siebrand Mazeland
1782c68d4d
Localisation updates from http://translatewiki.net .
2013-01-07 10:18:02 +00:00
John McLear
44981e8907
Merge pull request #1331 from mluto/fix-locales
...
Fixed broken placeholders in locales
2013-01-06 12:03:34 -08:00
mluto
c57ecf06ca
fixed broken placeholders in locales
2013-01-06 18:50:52 +01:00
mluto
5592c4b0fe
client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages
2013-01-06 16:11:48 +01:00
mluto
9484b92ae2
fixed and unified indenting, added comments in handleClientReady
2013-01-06 14:55:33 +01:00
mluto
77315aa1d4
Load CSS before JS, in timeslider
2013-01-06 12:26:00 +01:00
mluto
c56c7b8ca9
Load CSS before JS
...
According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
2013-01-06 12:19:56 +01:00
Stephan Jauernick
9f9f7a627e
corrected a documentation glitch for checkToken - clarified which token is validated
2013-01-02 15:14:46 +01:00
John McLear
c370f779cc
stop enter reloading new page on search result request
2013-01-02 14:01:39 +00:00
Marcel Klehr
53459fe160
release v1.2.3
2012-12-31 15:57:16 +01:00
Marcel Klehr
b6c9b4ec30
Fix #1309 : Fix support for node v0.6
2012-12-31 15:47:42 +01:00
John McLear
d9ef9f5648
Merge pull request #1308 from marcelklehr/fix/console-log-html10n-chrome
...
Fix #1307 : Chrome needs console.log to be called on console obj
2012-12-30 06:50:21 -08:00
Siebrand Mazeland
f894d9b8f4
Localisation updates from http://translatewiki.net .
2012-12-30 10:31:57 +00:00
Marcel Klehr
ba6e0d2a05
Fix #1307 : Chrome needs console.log to be called on console obj
2012-12-30 10:56:31 +01:00
Marcel Klehr
ffc9bcf028
Bump API version for checkToken endpoint
2012-12-27 22:09:22 +01:00
John McLear
b681359dfa
bump version # in package and update CHANGELOG
2012-12-27 20:09:14 +00:00
Marcel Klehr
369e24682b
Merge pull request #1297 from marcelklehr/migrate-to-html10n
...
Migrate to html10n and allow plugin l10n
2012-12-27 07:56:41 -08:00
John McLear
746396951d
Resolve #1301 startup pointing at old bitly URL
2012-12-26 00:17:43 +00:00
Marcel Klehr
220e084484
Simplify local locale file format
2012-12-23 22:43:32 +01:00
Marcel Klehr
d84951cd04
Remove locale file converter (ini2json)
2012-12-23 18:31:59 +01:00
Marcel Klehr
2055a2b176
[l10n] Convert all ini files to json
2012-12-23 18:23:56 +01:00
Marcel Klehr
fefbdb6fe1
Add direction info
2012-12-23 18:17:25 +01:00
Marcel Klehr
fdf6628cc5
Fix html attr translation
2012-12-23 18:17:23 +01:00
Marcel Klehr
04b65a0b4e
Add support for three-letter lang codes
2012-12-23 18:17:21 +01:00
Marcel Klehr
0c9178d392
Fix html10n usage in code that wouldn't allow lang switching
2012-12-23 18:17:19 +01:00
Marcel Klehr
580d936e50
Fix lang pre-selection of lang picker
...
(would break in cases when html10n might not have loaded yet)
2012-12-23 18:17:17 +01:00
Marcel Klehr
23b7469df6
[html10n] Don't expose lang code, if the language is not available
2012-12-23 18:17:14 +01:00
Marcel Klehr
7aba02f0cf
Don't break if a plugin hasn't got a locales dir
2012-12-23 18:17:12 +01:00
Marcel Klehr
cf24e53eae
Simplify server-side i18n code and make it a bit more understandable
2012-12-23 18:17:10 +01:00
Marcel Klehr
4a489f85f6
Fix translations in timeslider template
2012-12-23 18:17:08 +01:00
Marcel Klehr
f68adc8553
Fix translations in timeslider code
2012-12-23 18:17:05 +01:00
Marcel Klehr
e34036513e
There's no utf8, but there's utf-8
2012-12-23 18:17:03 +01:00
Marcel Klehr
3c3c1630b1
Revert "Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!"
...
This reverts commit 5fb7a03fb34078a75fe5932563e5a9fe44c57015.
2012-12-23 18:17:01 +01:00
Marcel Klehr
00d7ebc646
Allow html10n to handle import paths relative to the importing file
2012-12-23 18:16:59 +01:00
Iván Eixarch
9d459687af
fixed bug in parseIni
2012-12-23 18:16:56 +01:00
Iván Eixarch
bc0d9c854b
use relativa path in import definitions of locales.json
2012-12-23 18:16:54 +01:00
Marcel Klehr
d9d0312a9e
Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!
...
(As if we wouldn't look forward to that...)
2012-12-23 18:16:52 +01:00
Marcel Klehr
51f6ac6b71
Fix lang picker, again
2012-12-23 18:16:50 +01:00
Marcel Klehr
a2b2257851
Fix html10n cache and lang fallback
2012-12-23 18:16:48 +01:00
Marcel Klehr
e3f9ed37b4
Hacky solution for exploreDir error
...
We should only traverse the directories of actual plugins instead
of traversing the whole node_modules folder
2012-12-23 18:16:45 +01:00
Marcel Klehr
f4f2c1d9ab
Fix lang picker
2012-12-23 18:16:43 +01:00
Marcel Klehr
64b176f4de
Fix html10n (finally)
2012-12-23 18:16:41 +01:00
Marcel Klehr
67c893aaca
Fix html10n and the locale resource <link>s
2012-12-23 18:16:39 +01:00
Iván Eixarch
2b860986e8
support for json in i18n
2012-12-23 18:16:37 +01:00
Iván Eixarch
1f4a171f10
convert language files from ini to json
2012-12-23 18:16:35 +01:00
Marcel Klehr
6446281254
Migrate lang picker and embed param to html10n.js
2012-12-23 18:16:32 +01:00
Iván Eixarch
754467782f
convert language files from ini to json
2012-12-23 18:16:22 +01:00
Iván Eixarch
f72ec3eb28
convert language files from ini to json
2012-12-23 18:16:19 +01:00
Marcel Klehr
25be9b8c93
Add kick-off code for client-side l10n
2012-12-23 18:16:17 +01:00
Marcel Klehr
edacb3e2ca
Update html10n.js
2012-12-23 18:16:15 +01:00
Marcel Klehr
53521c8732
Replace webL10n with html10n.js
2012-12-23 18:16:13 +01:00
Siebrand Mazeland
f0b613aa57
Localisation updates from http://translatewiki.net .
2012-12-21 18:45:56 +00:00
Siebrand Mazeland
fd848c30fd
Localisation updates from http://translatewiki.net .
2012-12-16 22:01:37 +00:00
Siebrand Mazeland
48b1eb1aa9
Localisation updates from http://translatewiki.net .
2012-12-16 19:17:25 +00:00
John McLear
a5965bcdb5
Merge pull request #1244 from Wikinaut/add-socketio-transport-protocol-parameter
...
add socketTransportProtocols parameter
2012-12-10 15:15:05 -08:00
Wikinaut
05e8c74307
removed console.log of transport protocols
2012-12-10 22:33:00 +01:00
John McLear
bf5283fa11
Fix issue #725 which was caused by a race condition
2012-12-10 11:34:53 +00:00
John McLear
f1ca9bb456
Merge pull request #1272 from stephan48/patch-1
...
Added a checkToken Method for checking the Validity of the API Token
2012-12-10 01:17:11 -08:00
Iván Eixarch
ff8b4b6b20
change key of message sucessfull on import
2012-12-09 17:34:32 +01:00
Iván Eixarch
0371d5ba9e
Remove async load of l10n.js because Chrome fail to translate
2012-12-09 09:41:30 +01:00
Iván Eixarch
9f1872afc1
use properties notation
2012-12-09 08:56:58 +01:00
Iván Eixarch
854ed56037
Merge remote branch 'ether/develop' into jstranslate
2012-12-09 08:43:19 +01:00
Siebrand Mazeland
25125c30c3
Localisation updates from http://translatewiki.net .
2012-12-08 18:47:42 +00:00
Wikinaut
5a4c8e2a4a
Merge remote-tracking branch 'upstream/develop' into add-socketio-transport-protocol-parameter
2012-12-08 03:04:48 +01:00
Marcel Klehr
45b1e3eacb
Merge pull request #1249 from leblanc-simon/develop
...
Fix author colors in chat
2012-12-07 05:59:28 -08:00
Stephan Jauernick
4318d210ce
Update src/node/db/API.js
...
Corrected function documentation.
2012-12-07 11:28:03 +01:00
Stephan Jauernick
26ece95905
Update src/node/db/API.js
...
Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).
2012-12-07 11:28:03 +01:00
Stephan Jauernick
2163c8be5c
Update src/node/handler/APIHandler.js
...
Added the checkToken function to the function array.
2012-12-07 11:28:03 +01:00
Stephan Jauernick
8686da87e8
Update src/node/db/API.js
...
Added a checkToken method for checking if the API token is valid.
2012-12-07 11:28:03 +01:00
Wikinaut
5bf79971b8
merged upstream develop
2012-12-07 08:59:13 +01:00
Iván Eixarch
b01903202c
Added new strings to translate for js files
2012-12-07 05:24:40 +01:00
John McLear
98e03c1d87
Merge pull request #1268 from ether/fix/eejs-block-caching
...
Fix #1247 , #1201 : Don't cache eejs blocks!
2012-12-06 12:13:39 -08:00
Marcel Klehr
c909ed256f
Fix #1247 , #1201 : Don't cache eejs blocks!
...
Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
2012-12-06 18:35:35 +01:00
goldquest
1380fda2b2
use the parent window, not the top
2012-12-06 17:51:43 +01:00
Iván Eixarch
1a5035ae6b
reverse old change
2012-12-06 11:53:58 +01:00
Iván Eixarch
bf04a4686a
avoid use of os.tmpDir() for node 0.6 compatibility
2012-12-06 11:49:04 +01:00
Iván Eixarch
f9b6d9f122
Merge remote branch 'ether/develop' into develop
2012-12-06 11:22:05 +01:00
goldquest
7631096135
fix for multiple cookies support (Also fix for, when session is not valid anymore)
2012-12-06 02:01:38 +01:00
goldquest
4ce16b526e
Added semicolons
2012-12-06 02:00:58 +01:00
John McLear
6b3917cde7
Merge pull request #1257 from marcelklehr/fix/api-if-requireAuth
...
Fix #1219 : Make api work if requireAuth is enabled
2012-12-05 07:27:59 -08:00
Marcel Klehr
b5af643969
Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-size
...
Reduce the file input's width in the import popup to prevent overflow
2012-12-05 06:14:05 -08:00
Guillaume AMAT
c853f8fad2
Reduces the width of the file input to prevent overflow in the import popup
2012-12-05 15:02:32 +01:00
Marcel Klehr
fe89a367cc
Fix #1226 : Chrome would load async js
2012-12-05 14:16:44 +01:00
Marcel Klehr
2f37afac66
Merge pull request #1255 from 0ip/feature/show-pl-version
...
Display plugin version numbers in /admin/plugins
2012-12-05 05:09:20 -08:00
Marcel Klehr
377ff1eade
Fix #1219 : Make api work if requireAuth is enabled
2012-12-05 14:04:48 +01:00
0ip
8d0ef88baf
Adjust select width
...
looks better :)
2012-12-05 12:55:48 +01:00
0ip
20f13bc8ce
Add comment to explain how the property containing the version is being read
2012-12-04 19:08:25 +01:00
0ip
1fc5519c86
Display plugin versions
2012-12-04 14:30:30 +01:00
Iván Eixarch
a2b22652ce
added direction language in English
2012-12-04 13:02:23 +01:00
Iván Eixarch
5f949b8457
Update language4translatewiki 0.1.3
2012-12-04 12:12:58 +01:00
Iván Eixarch
b21c4403b2
Merge remote branch 'ether/develop' into languages4translatewiki
2012-12-04 11:40:17 +01:00
John McLear
55d543f9ca
Merge pull request #1221 from ether/focus-on-password
...
proper fix for focus and some styling of the form and allows for pressin...
2012-12-03 06:35:16 -08:00
John McLear
1e8d954560
best I can do with this temporary fix for IE
2012-12-03 14:28:25 +00:00
John McLear
b3e55f64a8
stop password being clearly visible
2012-12-03 13:10:32 +00:00
John McLear
0b92fdfc62
fix IE auth but only a temp fix
2012-12-03 12:47:11 +00:00
Marcel Klehr
17fb60e483
Merge pull request #1248 from ether/improved-search
...
Improve plugin search
uses modules descriptions too now, bit more cpu heavy, but that's okay
2012-12-03 04:14:15 -08:00
John McLear
d09894ce77
make it show password dialog on wrong password
2012-12-03 12:05:11 +00:00
John McLear
4843840d72
last JS fix
2012-12-03 11:44:30 +00:00
John McLear
b0463bd7d5
whoopsi
2012-12-03 11:41:51 +00:00
John McLear
bef25b40f8
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-03 11:37:01 +00:00
root
84d154b168
Update strings, add UK strings, fix JS
2012-12-03 11:35:06 +00:00
Simon Leblanc
38b14c40f0
Add same color in pad and chat for author
2012-12-03 03:43:56 +01:00
John McLear
b5c263dd37
improve search to use description too, bit more cpu heavy for thats okay
2012-12-03 01:41:01 +00:00
Iván Eixarch
657322db91
fixed git merge confict
2012-12-03 01:39:59 +01:00
John McLear
8a9045b335
remove ssl not enabled message
2012-12-02 18:33:31 +00:00
Wikinaut
0d2eddb62a
console.debug socketTransportProtocols
2012-12-02 18:54:30 +01:00
Wikinaut
9224e9beef
removed wrong comment in Settings.js
2012-12-02 18:44:39 +01:00
Wikinaut
8b044254cc
add socketTransportProtocols parameter
2012-12-02 18:28:28 +01:00
John McLear
a74defdab7
Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:07:23 +00:00
John McLear
c9a5e55654
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:06:33 +00:00
root
3cdf66c2f7
first effort to move into templates but javascript is broken so dont pull
2012-12-02 17:03:56 +00:00
Siebrand Mazeland
e9e4d65ad4
Localisation updates from http://translatewiki.net .
2012-12-02 12:35:02 +00:00
Iván Eixarch
b0b64358f9
Merge remote branch 'ether/develop' into develop
2012-12-02 05:57:14 +01:00
Niklas Laxström
d4b79a6cba
Localisation updates from http://translatewiki.net .
2012-12-01 11:32:26 +00:00
John McLear
3dcbd8dd4e
fix the control S to save a revision
2012-11-30 23:28:34 +00:00
John McLear
a4c4d11cd4
fix letter s...
2012-11-30 15:26:51 -08:00
John McLear
d761003588
fix path to favicon resolves #1236
2012-11-30 22:50:54 +00:00
Marcel Klehr
ab148ebc1a
Merge pull request #1229 from ether/control-s
...
catch control S and send an event to save a revision -- fixes #1128
2012-11-29 08:57:10 -08:00
John McLear
53d6d0813e
Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers
...
Let socket.io decide which transport is best for the browser
2012-11-29 06:55:51 -08:00
Marcel Klehr
719fb7e045
Let socket.io decide which transport is best for the browser
2012-11-29 13:42:37 +01:00
Iván Eixarch
795a20b3f2
get languages availables through translatewiki API
2012-11-28 23:54:23 +01:00
John McLear
93e9d7c852
remove control S comment
2012-11-28 17:20:58 +00:00
John McLear
8c7939ec9f
catch control S and send an event to save a revision
2012-11-28 17:17:35 +00:00
Iván Eixarch
9ec8a6e3d3
back to globalize... don't work :S
2012-11-28 04:02:55 +01:00
Iván Eixarch
1cc0e8cbf0
Restore original ini file
2012-11-28 03:27:09 +01:00
Iván Eixarch
523c7aebe5
Merge remote branch 'ether/develop' into develop
2012-11-28 03:13:04 +01:00
John McLear
c445197e7f
Update src/static/css/pad.css
2012-11-27 15:10:36 +00:00
Iván Eixarch
97d77ea089
added my name in header
2012-11-27 00:11:45 +01:00
Iván Eixarch
6fe6103632
added languages for translatewiki
2012-11-26 23:40:31 +01:00
Iván Eixarch
7280376a26
Merge with ether develop
2012-11-26 22:11:31 +01:00
John McLear
f880473360
remember the styling for the pasword prompt
2012-11-26 20:54:28 +00:00
John McLear
fddca354b3
proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix
2012-11-26 20:52:10 +00:00
John McLear
b66c9135f7
Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap
2012-11-26 20:20:21 +00:00
John McLear
6239c66e36
remove alert on line wrap as it doesnt mean anything
2012-11-26 20:19:27 +00:00
John McLear
491bf515c6
Merge pull request #1199 from leblanc-simon/develop
...
improving the translation of the timeline
2012-11-26 11:48:08 -08:00
Wikinaut
a49bab5dae
fix timeslider rightstep button position
2012-11-26 08:54:13 +01:00
Iván Eixarch
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +01:00
Iván Eixarch
460200981e
Merge remote branch 'ether/develop'
2012-11-26 02:21:18 +01:00
Niklas Laxström
de5a90b9c7
Localisation updates from http://translatewiki.net .
2012-11-25 12:52:08 +00:00
John McLear
fdf0b1a384
Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-support
...
Fix 1148 add native node https support
2012-11-24 16:35:02 -08:00
Iván Eixarch
6d5907562d
Fixed installed plugins section in plugins/info
2012-11-24 03:18:22 +01:00
Iván Eixarch
8ac49477f9
Fix 1203: non-escaped html in plugins info
2012-11-24 00:42:44 +01:00
Iván Eixarch
ef7590fb73
Fix 1203: non-escaped html in plugins info
2012-11-24 00:26:48 +01:00
Iván Eixarch
0250f8d55c
Merge remote branch 'ether/develop'
2012-11-23 22:57:05 +01:00
Iván Eixarch
cc60b82a6e
Import html by default and allow basic import/export features without abiword
2012-11-23 22:55:25 +01:00
Iván Eixarch
ef3231efd2
cleaning
2012-11-23 19:06:18 +01:00
Iván Eixarch
d0a17d5471
test import converting to html instead to txt by default
2012-11-23 18:18:03 +01:00
Simon Leblanc
94e9cf0a32
improving the translation of the timeline
2012-11-23 06:20:09 +01:00
Wikinaut
eed6b752d4
initial https version fix #1148
2012-11-22 10:12:58 +01:00
John McLear
1899e3f48d
Merge pull request #1197 from hcartiaux/urlfix
...
Fix urls, use github.com/ether
2012-11-21 16:22:21 -08:00
Hyacinthe Cartiaux
d6027726e6
Fix urls, use github.com/ether
...
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
John McLear
a662db222f
Merge pull request #1193 from kingmook/patch-1
...
pad.js - Gramatical fix
2012-11-21 14:42:12 -08:00
Mike Brousseau
196aafd9d6
Update src/static/js/pad.js
...
Gramatically change. Changed "You're Password" to "Your Password".
2012-11-21 13:35:47 -05:00
johnyma22
064051a30d
Bump stuff to 1.2.1
2012-11-21 18:20:54 +00:00
John McLear
34df9d651e
Merge pull request #1188 from joker-x/master
...
Allow ! in pads urls
2012-11-21 09:53:58 -08:00
Marcel Klehr
dcb3da829d
Fix #1186 Autodetection wouldn't work correctly in IE9
2012-11-21 17:45:01 +01:00
Iván Eixarch
beb5bf4d7d
Merge remote branch 'ether/develop'
2012-11-21 03:37:42 +01:00
Iván Eixarch
0c70ada9d7
Allow ! in urls autodetection
2012-11-21 03:35:49 +01:00
Marcel Klehr
a6cbcc9d51
Merge pull request #1185 from Nikerabbit/develop
...
Localisation updates from http://translatewiki.net .
2012-11-20 13:11:30 -08:00
Marcel Klehr
8a23c2ff50
Use ; as comments indicator in i18n files
2012-11-20 22:08:42 +01:00
Niklas Laxström
4e18df45c6
Localisation updates from http://translatewiki.net .
2012-11-20 20:47:34 +00:00
Marcel Klehr
4053ab2dfa
Clarify English strings and rephrase some stupid-sounding messages.
2012-11-20 21:35:06 +01:00
Iván Eixarch
1e71797ad5
Replace Globalize with languages module
2012-11-20 19:46:17 +01:00
Sarhan Aissi
67de23225a
Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini
2012-11-18 16:44:59 +01:00
John McLear
d6c0f96084
Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-times
...
optimize l10n loading times
2012-11-17 07:31:21 -08:00
John McLear
73eafb92c2
Merge pull request #1178 from marcelklehr/fix/tests
...
Fix/tests
2012-11-17 07:31:03 -08:00
Marcel Klehr
364e6928b5
Make tests work on windows
2012-11-17 16:28:54 +01:00
Marcel Klehr
5baef07b55
Load l10n.js first but asynchronusly
2012-11-17 15:28:33 +01:00
Marcel Klehr
e131f60071
Serve English strings directly with /locales.ini
2012-11-17 14:33:01 +01:00
Marcel Klehr
a39faf9368
Fix #1115 correctly reference session cookie
2012-11-17 14:19:09 +01:00
Sarhan Aissi
716aa13a79
Fix examples url in settings.html to use ether/
2012-11-16 10:39:38 +01:00
Iván Eixarch
dd845f7731
fixed label languague
2012-11-15 13:41:44 +01:00
Iván Eixarch
ce371235b3
Traducción al castellano/Spanish translation
2012-11-15 11:44:31 +01:00
Marcel Klehr
6d2391dba6
Fix version number in changelog and package.json
2012-11-14 22:02:40 +01:00
John McLear
ae2fee8be8
Sigh. I must have forgotten to commit this..
...
Apologies.
2012-11-14 19:38:17 +00:00
johnyma22
8b50f194a3
fix README to use ether/
2012-11-14 19:26:37 +00:00
John McLear
68b1d78f32
Merge pull request #1159 from marcelklehr/fix/lang-autodetection
...
Fix language auto-detection
2012-11-14 10:58:07 -08:00
John McLear
a3ff346547
Merge pull request #1152 from marcelklehr/fix/updatePadClients-error
...
PadMessageHandler: Make sure sessioninfos[session] still exists before p...
2012-11-14 10:44:30 -08:00
Marcel Klehr
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +01:00
0ip
dcff0d74ef
Fix Timeslider translation not showing up
2012-11-14 19:31:09 +01:00
Marcel Klehr
37450340ee
Fix typo in timeslider.pageTitle string in french translation
2012-11-14 18:05:51 +01:00
0ip
b69396d5a0
Fix French locale une autre fois
2012-11-14 17:29:06 +01:00
0ip
d65460a409
Add missing colon in fr-locale
2012-11-14 17:15:28 +01:00
0ip
440804ce0b
Update French localization
2012-11-14 17:13:19 +01:00
Marcel Klehr
f5563ab704
Move locale detection to the client
...
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
2012-11-14 17:01:59 +01:00
Marcel Klehr
ffb7cf47f2
Mate timslider page title translateable
2012-11-14 15:31:43 +01:00
0ip
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01:00
John McLear
2d31d3fc46
add colon to language
2012-11-14 12:20:41 +00:00
John McLear
2657f06887
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
2012-11-14 10:19:52 +00:00
John McLear
838a1e3d69
just export on timeslider, no import..
2012-11-14 09:31:27 +00:00
John McLear
0e6a701f92
Update src/templates/timeslider.html
2012-11-14 09:20:16 +00:00
John McLear
e0935d9e25
Update src/locales/fr.ini
2012-11-13 20:09:02 +00:00
John McLear
c65a03aaff
Update src/locales/fr.ini
2012-11-13 20:08:38 +00:00
johnyma22
a041cea834
French translation thanks to Francis-William Rhaume
2012-11-13 20:06:44 +00:00
John McLear
5b23e99d8c
resolve #1044
...
https://github.com/Pita/etherpad-lite/issues/1044
2012-11-13 19:23:55 +00:00
Peter 'Pita' Martischka
6de7634357
merged develop back in
2012-11-13 07:43:48 -08:00
Peter 'Pita' Martischka
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
0ip
b28afe4c47
Adjust border-color of #sidediv
2012-11-13 12:42:52 +01:00
0ip
c2253e49b6
Add ability to set language via URL parameter
2012-11-12 18:31:02 +01:00
0ip
b38f5d8f0c
Fix German translation
2012-11-12 18:11:06 +01:00
Marcel Klehr
19c12239f6
Simplify lang setting in pad.html template
2012-11-12 18:04:21 +01:00
Marcel Klehr
993d501943
Make L10n.js requireable
2012-11-12 17:42:07 +01:00
Marcel Klehr
ed3020c729
Translate timeslider export links
2012-11-12 17:34:29 +01:00
Marcel Klehr
e81563e18d
German translation for timeslider
2012-11-12 17:26:20 +01:00
Marcel Klehr
3bc59f0a7c
Add english translation file
2012-11-12 17:25:53 +01:00
Marcel Klehr
378a74fb4e
Remove translated strings from template files
2012-11-12 17:24:14 +01:00
Marcel Klehr
4154d464a5
Fix german translation
2012-11-12 16:53:39 +01:00
Marcel Klehr
7021a8b885
Add pad setting for UI lang
2012-11-12 16:49:15 +01:00
Marcel Klehr
fb340793da
Add an empty locales/en.ini - English is default lang in templates
2012-11-11 11:56:59 +01:00
Marcel Klehr
e914c972f4
Add german translation for index.html and pad.html
2012-11-10 14:13:51 +01:00
Marcel Klehr
e5d1c6b279
Allow translation of pad.html
2012-11-10 14:13:10 +01:00
Marcel Klehr
145e893273
Allow translations for index.html
2012-11-10 14:12:58 +01:00
Marcel Klehr
a3504f70c4
Add i18n component
2012-11-10 14:12:17 +01:00
Marcel Klehr
e24ed46a08
PadMessageHandler: Make sure sessioninfos[session] still exists before pushing data to user.
2012-11-10 10:47:12 +01:00
Mike Brousseau
34594eb88b
Update src/static/js/pad.js
...
Check if the browser is IE and if so output the entire path via document.location over document.location.pathname to the cookie creation in createCookie()
2012-11-08 13:47:21 -05:00
Marcel Klehr
d26f5d64f7
Fix #1130 Reload settings on /admin/settings server restart
2012-11-06 17:35:52 +01:00
Marcel Klehr
e702a86c9f
Add ability to reload settings
2012-11-06 17:35:05 +01:00
John McLear
7febd3ff5c
Resolve #583
...
This kinda resolves the issue but not in a very graceful way. It means any numbered items > 99 will still be cropped.
The problem is due to no padding/margin and then needing to specify margin.
you can replicate this bug with
```
<body style="padding:0; margin:0">
<style type="text/css">
li:nth-child(n+10){
margin-left:1.6em;
}
</style>
<ol style="list-style-type: decimal;margin-left:1.5em;padding:0;">
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
</ol>
</body>
```
2012-11-06 12:37:35 +00:00
John McLear
f68bdde0c1
resolve #1131 make textarea resize
2012-11-06 11:56:19 +00:00
John McLear
28bcdcec25
Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter
...
fix #377 : add favicon url as optional settings.json parameter
2012-11-06 03:08:25 -08:00
John McLear
6f1bab5faf
correct links to example settings.json files
2012-11-05 13:16:07 +00:00
John McLear
b9541f938b
Merge pull request #1127 from Pita/admin-page
...
add express endpoint for admin index.html
2012-11-05 04:59:01 -08:00
John McLear
3766858dd2
add express endpoint for admin index.html
2012-11-05 12:58:02 +00:00
John McLear
b6a331b9ec
Merge pull request #1120 from Pita/feature/settings-admin
...
Modify Server Settings in /admin/settings
2012-11-05 04:48:59 -08:00
John McLear
dfa0ae9181
Merge pull request #893 from marcelklehr/feature/plugin-settings
...
Add a new section in settings.json specifically for installed plugins.
2012-11-05 04:48:47 -08:00
Wikinaut
a575de7884
allow favicon.ico as pad name
2012-11-04 13:02:55 +01:00
Wikinaut
c92b5283fd
fix #377 : add favicon url as optional settings.json parameter
2012-11-04 11:26:17 +01:00
Peter 'Pita' Martischka
6408581adb
merged develop back in
2012-11-03 18:16:36 +00:00
johnyma22
2f123970e6
Make express restart - I think this reloads settings
2012-11-02 15:21:12 +00:00
johnyma22
1d055f2cd4
make stuff work
2012-11-02 15:15:13 +00:00
johnyma22
3ca450fefc
make the server save settings
2012-11-02 15:10:01 +00:00
johnyma22
7fa5dd757e
remove cruft from js and move minify json to seperate file and also send emit back to server on save settings
2012-11-02 15:05:47 +00:00
johnyma22
f6fa897a4e
actually using text area is a lot less stupid
2012-11-02 14:31:52 +00:00
Chia-liang Kao
4827cdbd96
fix imported ol that were turned into ul
2012-11-02 21:39:40 +08:00
johnyma22
89e38ed4c2
Start putting file system together for admin settings, no where near complete
2012-11-02 13:16:15 +00:00
Marcel Klehr
6d543fbcb3
Add a setting for customizing the app title
...
the app title is inserted into the <title> of all tepmlates
2012-11-02 12:30:57 +01:00
Peter 'Pita' Martischka
d6d07570bf
added webdriver to npm dependencies
2012-11-01 22:03:51 +00:00
Marcel Klehr
2d6e577683
Put up some '/admin doesn't exist' notice.
2012-11-01 19:45:26 +01:00
John McLear
5629063b9c
Allow robots.txt to be custom
2012-11-01 13:32:04 +00:00
Marcel Klehr
ed2faa68c9
Pass on the req object to eejs hooks
2012-11-01 13:44:59 +01:00
Marcel Klehr
059f6d280e
Pass on the render args to all eejs hooks
...
eejs.require('foo', {..render args..}) will
be passed on to all eejsBlock_X hooks as `hookContext.renderContext`
2012-11-01 13:44:06 +01:00
John McLear
28acfc70de
Merge branch 'develop' of github.com:Pita/etherpad-lite into release/releases-1.1.5
2012-10-31 12:32:12 +00:00
johnyma22
d929877865
JS fix for #1077 fire event at start because of the resize issue, this is a clean way of doing it
2012-10-30 22:35:01 +00:00
johnyma22
d30bb6d892
fixes a tiny css bug #1077
2012-10-30 21:57:15 +00:00
johnyma22
14ef06c699
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-30 17:22:08 +00:00
johnyma22
12bd520846
bump version #
2012-10-30 13:51:29 +00:00
johnyma22
1c847dbde3
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-10-29 22:48:32 +00:00
johnyma22
8d7a02816f
remove opacity to fix opera bug #941
2012-10-29 22:47:42 +00:00
John McLear
b2446fa61f
Merge pull request #1098 from Pita/span-two-lines-on-less-than-400px
...
make anything less than 400px span 2 lines on toolbar and make popups ap...
2012-10-29 15:00:11 -07:00
johnyma22
898331b680
fix rtl sanity
2012-10-29 21:55:57 +00:00
johnyma22
4f04d14cab
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-10-29 19:30:29 +00:00
johnyma22
0e41e9fdfc
allow max chat to be 999 chars
2012-10-29 19:29:30 +00:00
johnyma22
4f85bf09cc
make anything less than 400px span 2 lines on toolbar and make popups appear below this
2012-10-29 19:20:02 +00:00
Peter 'Pita' Martischka
0420b89382
Merge pull request #1097 from Pita/develop
...
Pull in Develop branch so we can test latest develop
2012-10-29 07:25:34 -07:00
John McLear
b4680e42d7
add a keystroke check for chat and make it so the chat listens on event 13 aswell as event 10
2012-10-28 17:38:56 +00:00
Marcel Klehr
78e64ffea8
Mimic, replace or work around removed npm utils.
2012-10-28 18:34:20 +01:00
Marcel Klehr
e447a6fade
Make sure npm is initialized before requiring things ( fix #1092 )
2012-10-28 18:02:49 +01:00
Peter 'Pita' Martischka
9537892c61
wrap spec files with a describe
2012-10-27 17:29:17 +01:00
Peter 'Pita' Martischka
cac27c864a
load list of spec files from the server
2012-10-27 17:05:26 +01:00
Peter 'Pita' Martischka
cc7ddddd2f
redirect from frontend to frontend/
2012-10-27 16:41:17 +01:00
Peter 'Pita' Martischka
f59b643aa6
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-27 16:32:37 +01:00
Randy
399080ad73
Add IIS config file
2012-10-25 10:22:28 -07:00
Randy
596e20e123
Add default port of process.env.PORT if port isnt specified in settings.json
2012-10-25 10:21:34 -07:00
John McLear
2ecd5719fc
Merge pull request #1073 from Pita/librejs-header
...
Add LibreJS Licensing information to headers of HTML templates
2012-10-25 06:53:38 -07:00
John McLear
a01768fc46
Merge pull request #1086 from neurolit/patch_relative_static_links
...
Templates: relative links instead of absolute ones for /static directory
2012-10-25 06:52:16 -07:00
John McLear
58d559b962
fix marcels trailing ,
2012-10-25 05:24:42 -07:00
John McLear
9582881278
Merge pull request #1088 from marcelklehr/fix/update-npm
...
Update npm
2012-10-25 05:21:11 -07:00
John McLear
0e9695bfb0
Merge pull request #1089 from marcelklehr/legal/extend-collaboraters
...
Add myself to the list of contributers
2012-10-25 05:20:49 -07:00
Marcel Klehr
ff2824ae7a
Add "Marcel Klehr" to contributers list
2012-10-25 13:45:40 +02:00
Marcel Klehr
1bc9d61027
Update npm ( fix #1012 )
2012-10-25 13:38:28 +02:00
0ip
cb760aae52
Fix broken layout (Chrome Mobile)
2012-10-25 14:37:41 +03:00
neurolit
526610e2e7
Templates: relative links instead of absolute ones for /static directory
...
…irector
Two links were absolute ("/static/...") instead of relative
("../static"). The image was not loaded with sites behind reverse
proxies and subdirectory.
2012-10-24 19:48:13 +02:00
Chia-liang Kao
8199bf8377
Do not assume window object exists
2012-10-23 15:21:05 +08:00
johnyma22
a770910a3a
Add LibreJS Licensing information to headers of HTML templates
2012-10-17 17:53:28 +01:00
John McLear
429651874f
Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexp
...
Fix #1067 Corrected exports links regexp
2012-10-16 13:36:20 -07:00
Marcel Klehr
6c89187f95
Fix #1067 Corrected exports links regexp
2012-10-16 20:46:27 +02:00
John McLear
b7d0751b18
couch, level, mongo, postgres, redis DB support
...
Support for additional underlying databases
2012-10-15 13:09:55 +02:00
John McLear
c45739becb
Update src/package.json
...
Bump version #
2012-10-11 23:38:56 +02:00
NAGOYA, Yoshihiko
957a0aa873
fix Pita/etherpad-lite #1032
...
refact inInternationalComposition
2012-10-12 01:12:15 +09:00
John McLear
d7ec050f34
Merge pull request #1035 from amtep/develop
...
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11 08:27:27 -07:00
Marcel Klehr
bedc51d2e3
Merge pull request #1057 from dmitryuv/sync-processing
...
fix for error handling in the callback code
2012-10-11 08:08:47 -07:00
Marcel Klehr
b0099a4aba
Add plugin-specific sections in settings.json
...
Settings for specific plugins are written down as below:
{
...
"ep_pluginname": {
"foo":"bar"
}
...
}
2012-10-11 16:22:40 +02:00
Dmitry
dbcdc2f956
fix for error handling in callback code
...
The callback code does not follow error handling guidelines, thus always
receiving NULL instead of results array.
2012-10-11 18:07:45 +04:00
Marcel Klehr
1461c4e19a
Merge pull request #1056 from dmitryuv/sync-processing
...
Fix variable name in handleMessageHook
2012-10-11 07:05:51 -07:00
Dmitry
0fa954c1a0
fixed variable name in handleMessageHook
...
the code would never work as expected with this type
2012-10-11 17:51:57 +04:00
Chad Weider
9d1274abaf
Drop method deprecated in Express 3.x.
2012-10-09 01:32:21 -07:00
Peter 'Pita' Martischka
ca6ebd6151
major restructering of the front end test framework
2012-10-08 00:34:29 +02:00
John McLear
90373964d3
Remove two instances of the same function name
...
Both functions did the same thing, the first function was buggy. Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
2012-10-06 02:36:51 +02:00
John McLear
db1a1a0e3e
Merge pull request #1034 from d-a-n/develop
...
Added hooks for pad events create/edit/load/remove
2012-10-05 17:28:40 -07:00
johnyma22
5c54b2c681
attempt to move onClick away from HTML.. This is required
2012-10-04 21:16:58 +01:00
John McLear
a1280fd917
Merge pull request #1004 from yourcelf/develop
...
Add `userColor` query param to set initial color
2012-10-04 10:57:16 -07:00
johnyma22
c74aed986e
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-04 18:55:57 +01:00
johnyma22
a97c63b809
Fix issue caused by broken async update
2012-10-04 18:53:02 +01:00
John McLear
66475f32f3
Merge pull request #1003 from Pita/express-v3
...
Upgrade Express to v3 [proposal]
2012-10-03 06:25:44 -07:00
d-a-n
a521a12583
Changed pad_id to padID to follow projct standards.
2012-10-03 15:50:43 +03:00
d-a-n
358e481731
Changed pad hook names to follow naming conventions. Arguments will now be passed as hash.
2012-10-03 13:41:40 +03:00
Marcel Klehr
2684a1d295
Merge branch 'develop' into express-v3
...
Conflicts:
src/node/hooks/express/errorhandling.js
2012-10-03 10:09:00 +02:00
Chad Weider
b29fc11e9d
Upgrade to Yajsml bug fix.
2012-10-02 19:57:23 -07:00
Richard Braakman
85b44119ae
USERINFO_UPDATE: construct a new message for broadcast
...
The server was reusing the client's message when broadcasting userinfo
updates. This would allow a malicious client to insert arbitrary fields
into a message that the other clients would trust as coming from the
server. For example, adding "disconnect" or renaming other authors.
This commit fixes it by having the server construct a new message with
known fields before broadcasting.
2012-10-02 23:27:30 +03:00
d-a-n
64a3d60b94
Added pad hooks (create, load, edit, remove)
2012-10-02 22:30:13 +03:00
Marcel Klehr
7656001cb5
Don't shut down the whole server, if error handling middleware is called.
...
The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...
2012-10-02 20:11:18 +02:00
John McLear
56453409a5
Update src/static/js/pad_editbar.js
...
Somehow </iframe> was no more. Now it is back.. Oh boy.
2012-10-02 02:19:44 +02:00
Peter 'Pita' Martischka
ba4ebbba3b
Setted up an enviroment for frontend tests, first steps
2012-10-02 00:35:43 +01:00
John McLear
7f6a81b0ed
Merge pull request #1006 from cweider/ace-cleanup
...
Ace cleanup
2012-10-01 13:05:10 -07:00
Richard Braakman
2e72a1e489
Prevent server crash in handleClientReady
...
The client might have disconnected between callbacks so don't try to
write to the session before checking this. The main callback of this
function now has a single check at its top.
Removed a redundant check halfway through the callback.
Also normalized use of client.id for the session index instead of a mix of
client.id and sessionId.
Added some explanatory comments.
2012-09-28 23:23:00 +03:00
Richard Braakman
413ddb393e
Add some explanatory comments to handleUserChanges()
2012-09-28 22:49:20 +03:00
Richard Braakman
7aaef01346
Prettify session handling in handleUserChanges
...
Also add a comment to explain what's going on with thisSession.
No changes in behavior.
2012-09-27 23:07:00 +03:00
Richard Braakman
f1b4206cad
Fix crash when client submits changeset based on too-old revision
...
We had a problem with the server running out of stack space if a client
submitted a changeset based on a revision more than about 1000 revs old.
(944 was our cutoff but yours may vary). This happened in the wild with
about 30 people editing via flaky wifi. A disconnected client would try
to submit a fairly old changeset when reconnecting, and a few minutes
was enough for 30 people to generate that many revs.
The stack kept growing because pad.getRevisionChangeset was being answered
from the cache, so no I/O interrupted the callback chain. (This was seen with
mysql, I don't know about other backends.)
This patch forces a nextTick every 200 revisions to solve this problem.
2012-09-26 03:01:59 +03:00
Richard Braakman
e16008b371
Fix sessioninfos race that can cause crash during USER_CHANGES handling
...
When stress testing etherpad-lite we occasionally got this error:
TypeError: Cannot read property 'author' of undefined
at /home/etherpad/etherpad-lite/src/node/handler/PadMessageHandler.js:556:47
handleUserChanges was accessing sessioninfos[client.id].author in a callback,
after spending some time in the loop that updates the changeset to the
latest revision. It's possible for a disconnect request to be processed
during that loop so the session might no longer be there.
This patch fixes it by looking up the author at the start of the function.
2012-09-26 03:01:59 +03:00
Marcel Klehr
0c9c1f514f
Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)
2012-09-22 16:03:40 +02:00
Marcel Klehr
0f436d5916
Migrate error handling middleware to express v3
2012-09-22 15:22:15 +02:00
Marcel Klehr
794c3d1afe
Set secret on cookieParser (migrate to express v3)
2012-09-22 14:05:41 +02:00
Marcel Klehr
71579d1478
Fix res.send (migrate to express v3)
2012-09-22 13:51:39 +02:00
Chad Weider
622819ba93
Make intialization of Ace2Inner analogous to other page controllers.
2012-09-21 22:09:55 -07:00
Chad Weider
9f5946c942
Reformat Ace2Editor frame boot scripts.
2012-09-21 22:09:55 -07:00
Chad Weider
fa65f889ec
Consolidate Ace2Editor frame's boot script.
2012-09-21 22:09:55 -07:00
Chad Weider
49915dfeb8
Upgrade to Yajsml with another Windows backslash fix.
2012-09-21 22:09:44 -07:00
Marcel Klehr
ff7cf991c9
Upgrade log4js to v0.5
2012-09-21 21:39:08 +02:00
Marcel Klehr
4416210471
Differentiate between http server and express app
2012-09-21 17:12:22 +02:00
Marcel Klehr
a72ade4494
Fix async.forEach in MultiSession code
2012-09-19 17:48:26 +02:00
Marcel Klehr
b9da0e187e
Revert "Fixed foreach loop on session IDs, was breaking EP on single session in cookie."
...
This reverts commit 443a71bc9c
2012-09-19 17:42:36 +02:00
John McLear
0883043eb9
Merge pull request #1014 from marcelklehr/feature/list-all-groups
...
Add listAllGroups API endpoint
2012-09-18 15:36:19 -07:00
johnyma22
443a71bc9c
Fixed foreach loop on session IDs, was breaking EP on single session in cookie.
2012-09-18 16:30:26 +01:00
John McLear
923b51033b
List 12 plugins instead of 4
...
4 was a bit stingy :) 12 is a bit more friendly from a UX persepctive.
2012-09-18 15:54:08 +02:00
Marcel Klehr
f8f002adc0
Add listAllGroups API endpoint
...
Adds a database key that lists all groups
2012-09-17 23:03:56 +02:00
Charlie DeTar
53113644a0
Require userColor to be valid css hex
...
The utility functions colorutils.js assume that background colors are in
CSS hex format, so require userColor to do the same, rather than
allowing inputs like "red" and "rgba(...)", to insure that inversion
checks will succeed.
2012-09-17 10:59:12 -04:00
Marcel Klehr
bbc8848af3
Still support API endpoints of v1 in v1.1
2012-09-17 16:29:39 +02:00
Charlie DeTar
bc6e495e8c
Use 'transparent' as reference to validate css
...
Use 'transparent' instead of 'white' as a reference color for validating
CSS color values. Presumably, a user setting a userColor wants some
color other than 'transparent' if they are setting it (they could always
duplicate the background's color if not).
2012-09-17 00:19:57 -04:00
Chad Weider
a0177e5d3c
Remember, the class symbol is reserved in some environments.
...
Fixes issue introduced in 9be69ef258
2012-09-16 18:07:55 -07:00
Charlie DeTar
afc90604bf
Add userColor query param to set initial color
...
Add a URL parameter which sets the initial color for a user, e.g.:
http://example.com/p/mypad?userColor=%2300ff00
Sanitize the given color value to ensure that it's a valid css value
(could be any supported CSS color format -- #fff, rgba(), "red", etc).
Shortly after rejoining a pad, the server responds with a USER_NEWINFO
message which may contain an old color value; however, this message
arrives after we have set and sent the new color value to the server.
To avoid this race condition, if the query parameter has been set,
ignore the color value in a USER_NEWINFO message which matches our user
ID.
2012-09-15 17:48:04 -04:00
John McLear
6f37de2fae
Update src/package.json
...
Bump to v 1.1.2
2012-09-14 17:33:45 +02:00
John McLear
e9e3ea305b
Merge pull request #992 from gedion/develop
...
Added hooks and made some ace functions available to editorInfo Object
2012-09-14 04:51:17 -07:00
John McLear
ba8177fc6f
Merge pull request #999 from lepidum/develop
...
Fixed international composition issues (e.g., Japanese Input method)
2012-09-14 04:50:08 -07:00
NAGOYA, Yoshihiko
71c9444694
fix for InternationalComposition(e.g., Japanese Input)
...
moved inInternationalComposition from Ace2Inner to top window
fix bindTheEventHandlers() because ie9 implement CompositionEvent
when inInternationalComposition, NEW_CHANGES msg and ACCEPT_COMMIT msg
are pushed msgQueue.
when handleUserChanges(), apply msgQueue.
2012-09-13 23:37:26 +09:00
Marcel Klehr
ad16c0d0d4
Bump API version to v1.1
2012-09-13 16:13:54 +02:00
johnyma22
c8b6d3b4f3
attempt to put correct init in right place but could be wrong
2012-09-12 19:38:53 +01:00
johnyma22
603f251824
error handling and close is removed in express 3
2012-09-12 19:34:33 +01:00
John McLear
d44c7f0bb5
Merge pull request #994 from cweider/parent-plugins
...
Parent plugins
2012-09-12 04:52:38 -07:00
John McLear
389e0d09b0
Merge pull request #740 from cweider/plugin-cleanup
...
Plugin cleanup
2012-09-12 04:52:23 -07:00
Chad Weider
feeab5c1b2
Fix cache headers for missing files.
2012-09-11 22:27:14 -07:00
Chad Weider
b691606c4e
Replace ParentRequire hack.
...
Instead of hacking with the internals of require, make client_plugins aware
and capable of sharing behavior.
2012-09-11 21:16:47 -07:00
Chad Weider
1258ed3a0d
Split client and server plugin functionality.
...
There is virtually no shared code for the client, extract it into its own
module and do away with the switches.
2012-09-11 21:16:47 -07:00
Chad Weider
9394495364
Inject plugins into hooks.
2012-09-11 21:16:47 -07:00
Chad Weider
3631f0ece3
Inject special normalization behavior.
2012-09-11 21:16:47 -07:00
Chad Weider
e375b6212a
Static functions are static.
2012-09-11 21:16:47 -07:00
Chad Weider
b0d71df604
Fix worthless indentation.
2012-09-11 21:16:47 -07:00
Gedion
a25feed1c2
fixed indentation
2012-09-11 17:49:58 -05:00
Gedion
3364eb131e
fixed comments
2012-09-11 17:02:53 -05:00
Gedion
9be69ef258
fixed plugins
2012-09-11 16:21:14 -05:00
Marcel Klehr
d05d587f21
Don't break if there is no session cookie.
2012-09-11 20:59:19 +02:00
John McLear
a4bd92c184
Merge pull request #983 from Pita/feature/multiple-api-versions
...
Add support for multiple api versions
2012-09-11 11:29:24 -07:00
Chad Weider
03bcd07741
Use packaged version of Tinycon.
2012-09-09 18:18:59 -07:00
Chad Weider
1541237654
Use packaged version of UNorm.
2012-09-09 18:18:59 -07:00
Chad Weider
19a7208c97
Clean up requires.
2012-09-09 18:18:59 -07:00
Chad Weider
0da4acfdb5
Use packaged edition of async.
2012-09-09 18:18:59 -07:00
Chad Weider
8e735b0841
Use packaged edition of underscore.
2012-09-09 18:18:59 -07:00
Chad Weider
b47f6ae905
Use packaged edition of security module.
2012-09-09 18:18:59 -07:00
Chad Weider
c4fa2ecddb
Don't prefix libraries that are prefixed by '$'. #hack
2012-09-09 18:18:58 -07:00
Chad Weider
3b40850195
Add index paths in tar processing.
2012-09-09 18:18:58 -07:00
Chad Weider
a5653c7192
Clean up tar file processing.
2012-09-09 18:18:58 -07:00
Chad Weider
b8faf1f78b
Serve libraries from node_modules.
2012-09-09 18:18:58 -07:00
Chad Weider
766c301a44
Only files should be treated as being existant.
2012-09-09 18:13:37 -07:00
John McLear
32b4729305
Merge pull request #987 from cweider/loopback-avoidance
...
Windows server fixes
2012-09-09 15:50:42 -07:00
Chad Weider
a97b83babc
Another workaround for Windows paths.
2012-09-09 14:42:32 -07:00
Chad Weider
3b5ea88bf5
If the file was not found this should be nothing.
2012-09-09 14:42:32 -07:00
Chad Weider
3312387b08
Drop embedding of modules.
...
With loopback removed, embedding concatenated resources doesn't happen. It
was a marginal feature to begin with so it will not be missed.
2012-09-09 14:40:20 -07:00
Marcel Klehr
ea0f7cb2e9
Add support for multiple api versions
2012-09-09 18:20:16 +02:00
Gedion
c37c48cd12
added hooks and made some functions available to editor info object in ace
2012-09-08 13:45:33 -05:00
Gedion
6d1cba2259
added hooks to contentcollector.js
2012-09-08 12:11:04 -05:00
Gedion
a2c8d21240
added hooks to contentcollector.js
2012-09-08 12:03:13 -05:00
John McLear
453b6473a0
Merge pull request #984 from lepidum/develop
...
Fixed ESC key handling issue of Firefox 15
2012-09-07 06:23:57 -07:00
John McLear
3cbd59c769
Update src/node/db/AuthorManager.js
2012-09-04 22:47:56 +02:00
John McLear
7e79bf3462
Update src/node/handler/APIHandler.js
2012-09-04 17:26:08 +02:00
John McLear
21dcce2296
Update src/node/db/AuthorManager.js
2012-09-04 17:25:19 +02:00
John McLear
40a7b43799
Update src/node/db/API.js
2012-09-04 17:23:33 +02:00
John McLear
c5be2eb418
Merge pull request #977 from cweider/loopback-avoidance
...
Loopback avoidance
2012-09-03 14:56:55 -07:00
Chad Weider
6e796eb5fb
Make exception case for require kernel obvious.
2012-09-03 14:41:26 -07:00
Chad Weider
02c22d7b89
Remove loopback from Minify.
2012-09-03 14:38:28 -07:00
Chad Weider
024a26f272
Minify publishes its own mock request thing.
2012-09-03 14:37:26 -07:00
Chad Weider
4413d498d8
Minify is a named function.
2012-09-03 14:35:36 -07:00
John McLear
de7934d9fb
Merge pull request #958 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues
...
Fix ie8 native xmlhttp support disabled issues
2012-09-03 06:35:52 -07:00
Marcel Klehr
dad83d9b77
Document multi-session cookie feature
2012-09-02 19:51:40 +02:00
NAGOYA, Yoshihiko
55cf1cabb5
fix prevent ESC key patch
2012-08-30 13:24:35 +09:00
NAGOYA, Yoshihiko
521e76ae44
prevent ESC key
2012-08-30 12:00:27 +09:00
Wikinaut
67088e5b7f
upd version resolve
2012-08-18 01:03:18 +02:00
Wikinaut
e82588c332
use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues
2012-08-18 00:47:13 +02:00
Mark Holmquist
f9469ef256
Add in padUsers HTTP API call
...
I needed the list of users this time, so I got it. There are docs
and everything.
2012-08-17 13:39:16 -07:00
Wikinaut
da30c8983a
fix issue #955 : upd resolve library to 0.2.3
2012-08-17 00:45:02 +02:00
Wikinaut
85f5eb38e4
fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled
2012-08-16 01:00:36 +02:00
Daniel Perez Alvarez
699aa299f8
Normalize inserted text using UNorm
...
For some reason, the client was sending the server a Unicode-normalized
version of inserted strings. So if for example we inserted the string
'ä' (i.e. \x61\xCC\x88) into the document, what would be sent to the
server would be 'ä' (i.e. \xC3\xA4).
This wouldn't be a problem on its own. BUT JavaScript reports that the
length of the first string is 2, while the length of the second one is
1.
So the command that was being sent to the server was 'Z:1>2*0+1$ä', when
it should really be 'Z:1>1*0+1$ä'. When the `checkRep` method checks the
length of the inserted string, it finds an inconsistency, and
disconnects the client.
We now normalize the inserted string before the command is generated, so
the length is always correct.
2012-08-13 17:09:02 +01:00
Daniel Perez Alvarez
48f1545777
Add Unicode normalization library
2012-08-13 17:06:25 +01:00
John McLear
71d6d520e8
Merge pull request #939 from marcelklehr/fix/group2sessions-bug
...
Create group2sessions.sessionIDs if it doesn't exist yet.
2012-08-12 09:10:29 -07:00
John McLear
a5f6815e65
Merge pull request #899 from marcelklehr/fix/show-onload-errors
...
Display errors occuring on page load to the user.
2012-08-12 08:55:24 -07:00
John McLear
14c874b80e
Merge pull request #903 from marcelklehr/feature/hook-loadSettings2
...
[API hook] loadSettings
2012-08-12 08:54:31 -07:00
John McLear
85191ca798
Merge pull request #905 from marcelklehr/feature/hook-documentReady
...
Add a documentReady client hook
2012-08-12 08:54:03 -07:00
John McLear
132278a9d6
Merge pull request #928 from marcelklehr/fix/update-socket-io
...
Update socket.io
2012-08-12 08:53:18 -07:00
John McLear
ba6acd822e
Merge pull request #929 from MarkTraceur/hook/http/send-clients-message
...
Add in an HTTP API call to send a custom message type.
2012-08-12 08:53:07 -07:00
John McLear
1eb63535ca
Merge pull request #931 from MarkTraceur/hook/plugin/handleClientMessage
...
Add in a plugin hook "handleClientMessage_<MSG_NAME>"
2012-08-12 08:52:53 -07:00
John McLear
a42b2440ba
Merge pull request #943 from gedion/develop
...
Add a hook for utils/ExportHtml.js
2012-08-12 08:48:10 -07:00
Gedion
e9b22e8ac3
fix indentation
2012-08-11 15:44:42 -05:00
gedion
4d11e49878
Update src/node/utils/ExportHtml.js
...
Added a hook for utils/ExportHtml.js
2012-08-11 13:08:28 -05:00
Gedion
df7d7769c8
Added a hook for util/ExportHtml.js
2012-08-11 13:02:01 -05:00
Mark Holmquist
44878bc0a3
Add in a plugin hook "handleClientMessage_<MSG_NAME>"
...
The new hook will accept only the message named in the hook call.
It will be used primarily for adding new message handlers, but it
can alse be used to handle existing message types.
2012-08-10 09:51:18 -07:00
Marcel Klehr
d9d28369b2
Create author2sessions.sessionIDs if it doesn't exist yet.
2012-08-10 16:20:07 +02:00
Marcel Klehr
d6a0cfc398
Create group2sessions.sessionIDs if it doesn't exist yet.
2012-08-09 11:15:26 +02:00
Mark Holmquist
3d4fb81796
Add in an HTTP API call to send a custom message type.
...
You cannot currently send any data with your custom message, but
this patch is just begging for a second one that will allow that.
2012-08-08 10:12:11 -07:00
Marcel Klehr
cb0066f7b4
Update socket.io
2012-08-07 19:40:45 +02:00
Marcel Klehr
aa986ab954
Merge branch 'fix/editorloadingbox' into develop
2012-08-02 09:00:04 +02:00
Marcel Klehr
2fd604973c
Remove the second occurrence of #editorloadingbox
2012-08-02 01:04:52 +02:00
Marcel Klehr
db54ab4b36
Merge pull request #887 from psifertex/develop
...
adding basic numbered list support to dokuwiki export
2012-08-01 12:36:04 -07:00
0ip
c9bdd1196d
Merge pull request #872 from marcelklehr/feature/connectivity-toolbar
...
Nice popups instead of modals
2012-08-01 11:37:15 -07:00
Wikinaut
11e601fbcd
fix #890 test if console is available before writing to console.log
2012-08-01 14:34:03 +02:00
Marcel Klehr
58d5203110
Add a documentReady client_hook.
2012-07-26 12:24:59 +02:00
odony
a2bf577393
Fix #769 - wonky bug with pasted lists
...
After 6507614e459dac868d3c76355ca013d13132bc79 the contentcollector does not properly "exit" lists back to the `none` listType anymore.
The repro steps on #769 seem to pass correctly after this change.
2012-07-25 13:45:53 +02:00
Marcel Klehr
de907cd0db
Add loadSettings hook.
2012-07-25 10:58:30 +02:00
Marcel Klehr
6f91facf49
Retain original onerror handler.
2012-07-23 15:03:20 +02:00
Marcel Klehr
c3dcb08a2c
Remove console.log
2012-07-23 14:33:30 +02:00
Marcel Klehr
fa3020dffd
Display errors occuring on page load to the user.
2012-07-23 14:12:36 +02:00
Marcel Klehr
9d25dcc1f9
Merge branch 'develop' into feature/connectivity-toolbar
...
Conflicts:
src/templates/pad.html
2012-07-23 11:26:15 +02:00
Chad Weider
cd11717b99
Eliminate the loopback that has been causing so much trouble.
...
`localhost`, `0.0.0.0`, `127.0.0.1` each works only in some places some of the time, this works around the problem by overriding Yajsml's built-in request mechanism in favor of a hacked together one. TODO: Serve files from another service, or directly from the file system in order to make this unnecessary.
Fixes #747
2012-07-22 23:55:07 -07:00
Uli Köhler
14582d1eba
Escaped title using Security.escapeHTML()
2012-07-22 19:07:14 +02:00
Uli Köhler
8630de66bf
Added missing newline after closing title tag
2012-07-22 18:37:38 +02:00
Uli Köhler
90357e0cdc
Added <title> tag to make exported HTML valid
2012-07-21 21:19:44 +02:00
Marcel Klehr
c3ddff3fa0
Notify the user, if JavaScript is disabled.
2012-07-19 11:34:14 +02:00
Jordan Wiens
c0daf1aaaf
adding basic numbered list support to dokuwiki export
2012-07-19 00:59:15 -04:00
Marcel Klehr
9aed433ad5
Fix #880 Remove call to padsavedrevs.handleIsFullyConnected
2012-07-18 15:54:53 +02:00
Matthias Bartelmeß
6b429b2ca1
Merge pull request #851 from marcelklehr/fix-settings.json
...
Fix settings.json
2012-07-17 10:27:18 -07:00
Mark Holmquist
9bd23acb3d
Add userJoinOrUpdate hook
...
This hook fires on the client side, whenever a user joins or
updates (hence the name). It will pass one thing, the user's info,
into the context. This is mostly just for notification purposes.
2012-07-17 10:12:10 -07:00
Marcel Klehr
eb6be84150
Fix html/css
2012-07-15 16:03:12 +02:00
0ip
b1123d11b6
Correct path
2012-07-14 20:35:26 +03:00
Marcel Klehr
4901adeac7
Fix timeslider.
2012-07-14 15:54:44 +02:00
Marcel Klehr
1466fa03a4
Fix some minor mistakes.
2012-07-14 15:54:20 +02:00
Marcel Klehr
2d0cf156af
Fix showModal animation.
...
New content shouldn' slide in before the containing popup.
2012-07-14 15:14:46 +02:00
Marcel Klehr
4220d6bedd
Put loading git back in.
2012-07-14 15:12:21 +02:00
Marcel Klehr
9a3cb2c727
Sort the toolbar buttons correctly.
2012-07-14 14:54:25 +02:00
Marcel Klehr
444467bef2
Remove connectivity tollbar button.
2012-07-14 14:50:52 +02:00
Marcel Klehr
8ab12ee69e
Only disable toolbar.
...
Make content available and allow scrolling
2012-07-14 14:46:02 +02:00
Marcel Klehr
6bda1f8e4d
Fix padeditbar.toggleDropDown
...
Only call callback, if one was passed.
2012-07-13 09:13:22 +02:00
Marcel Klehr
9e9cbd5ffa
Fix typo.
2012-07-13 08:24:02 +02:00
Marcel Klehr
6da6a7f0d8
Use nice editbar popups for connection status instead of srceen-blocking modals.
2012-07-13 08:23:22 +02:00
Marcel Klehr
dc9eda9364
Use Tinycon to display chat mentions in favicon.
2012-07-12 20:18:33 +02:00
Marcel Klehr
ead379cf66
Merge pull request #853 from fourplusone/feature/async_handleMessage
...
async handle message
2012-07-12 03:50:37 -07:00
Marcel Klehr
f12cb0dd58
Don't screw up, if chat is empty.
2012-07-12 10:34:11 +02:00
Marcel Klehr
7653db36fe
Revert "option to stop autoscroll"
...
This reverts commit 6726ea6632
2012-07-12 10:23:55 +02:00
Marcel Klehr
8a471e590a
Fix #581 Don't scroll chat automatically if user is not at the bottom
2012-07-11 22:30:03 +02:00
John McLear
6726ea6632
option to stop autoscroll
2012-07-11 17:42:59 +01:00
Marcel Klehr
dc09323d8f
Don't exit if no settings file was found.
2012-07-11 15:36:41 +02:00
Marcel Klehr
f09dd0f3fb
Put toString() back in.
2012-07-11 15:34:33 +02:00
Marcel Klehr
beb6378656
Merge pull request #850 from fourplusone/feature/remove_opt
...
CodeCleanup: remove unused _opt in favor of code size/readability
2012-07-10 13:03:44 -07:00
Marcel Klehr
87f26334d1
Fix typo.
2012-07-10 21:55:35 +02:00
Marcel Klehr
8858446678
Exit on error.
2012-07-10 21:38:14 +02:00
Jordan Hollinger
a7dd620b9f
Don't crash if setText isn't passed any text. issue #861
2012-07-10 00:53:55 -04:00
Matthias Bartelmeß
975171a86b
Make handleMessage async
2012-07-08 21:06:19 +02:00
Marcel Klehr
4c8f69b7c5
Use v8 to parse settings.json
2012-07-08 18:59:46 +02:00
Matthias Bartelmeß
3a0015c357
remove unused _opt in favor of code size/readability
2012-07-08 11:51:04 +02:00
Marcel Klehr
af3c57a120
Load npm to enable server to see the git revision.
2012-07-08 11:37:24 +02:00
Matthias Bartelmeß
9ff3aa0ee0
make /static/tests.html functional again,
...
added getLastEdited
2012-07-07 20:41:26 +02:00
Jordan Hollinger
6d5fe459f0
Bugfix to getLastEdited API method, issue #845
2012-07-07 13:22:27 -04:00
John McLear
34fdfcb253
Merge pull request #840 from redhog/master
...
Bugfix for readonly timeslider
2012-07-05 10:34:55 -07:00
Egil Moeller
17b6103a3d
Bugfix for broken readonly timeslider
2012-07-05 19:33:20 +02:00
John McLear
bc15ea5c15
Merge pull request #829 from marcelklehr/support-node-0.8
...
Support node 0.8
2012-07-05 09:54:25 -07:00
Egil Moeller
799a5768c7
Quick hack to hide ep_etherpad-lite in plugin list
2012-07-05 18:13:29 +02:00
Marcel Klehr
42bbbd426f
Add latest versions of async, express and connect.
2012-07-05 18:11:18 +02:00
Marcel Klehr
c01aaeefc1
Allow node v0.6.x and 0.8.x
2012-07-05 17:34:23 +02:00
Egil Moeller
a0548af021
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver
2012-07-03 23:32:37 +02:00
Egil Moeller
b438a278a1
Make the server restart on plugin install
2012-07-03 23:31:44 +02:00
Mark Holmquist
91ed1f57c5
Don't rewrite in a stupid way
...
Since we're already in the proper path for the pad, why worry
about it? Replacing the entire path of the URL with /p/padname may
have seemed like a good idea at the time, but really, for a 302 we
only need a relative pathname. This patch provides the proper way.
2012-07-02 16:46:31 -07:00
Marcel Klehr
9d35b51500
Replace path.exists with fs.exists
2012-06-30 18:57:59 +02:00
Mark Holmquist
a71a8a7efc
Add in padUsersCount method and API call
...
The PadMessageHandler objects now have a new API call associated
with them. I'm sure that's a funny place to put it, but the
pad2sessions object in that file seems to be the only place user
counts are stored!
Anyway, I hope this is helpful. I know it would be for me :)
2012-06-29 11:26:12 -07:00
Marcel Klehr
227477967f
Fix plugin loader
...
make it work on client side and with relative paths
2012-06-29 12:40:16 +02:00
Marcel Klehr
b0d369883b
Fix plugin loader to work with windows paths (e.g. 'D:\foo\...')
2012-06-28 15:58:28 +02:00
John McLear
711dee8f6b
Merge pull request #821 from marcelklehr/fix-contributor-api-methods
...
Fix contributor api methods
2012-06-27 12:12:41 -07:00
Marcel Klehr
93b50d4a29
Some fixes to the contributor API methods
...
Mostly these are coding style adjustments
2012-06-27 21:02:41 +02:00
John McLear
a717c11ab3
Merge pull request #819 from marcelklehr/contributor-api-methods
...
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
2012-06-27 11:31:25 -07:00
Mark Holmquist
ab0d3c87cb
Add in getLastEdited API call
...
This new HTTP API call, getLastEdited, will return the time of the
last revision, in UNIX timestamp format.
2012-06-27 10:05:17 -07:00
Marcel Klehr
6f9d7a5db7
Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPad
...
Return all pads that a given author has contributed to (not just
created) and return all authors who has contributed to a given pad.
2012-06-27 18:23:17 +02:00
John McLear
0bc01feb72
Merge pull request #818 from MarkTraceur/kick-on-deauth
...
Kick on deauth
2012-06-26 16:09:14 -07:00
Mark Holmquist
c4e660b206
Fix glaring problem with pull request
...
I accidentally forgot to call finalHandler if there was no padID
.... :)
2012-06-26 16:07:08 -07:00
John McLear
3d9a2360be
Merge pull request #817 from MarkTraceur/kick-on-deauth
...
Kick on deauth
2012-06-26 16:01:40 -07:00
Mark Holmquist
79ca5f3e7c
Refuse connection if the user is no longer authorized
...
This should do the trick for issue 815. Please review and merge if
it works.
Try again: Fewer variables.
2012-06-26 16:00:38 -07:00
Mark Holmquist
854e1092d9
Add in a new hook for handleMessage
...
Add a new hook: handleMessage. Whenever a message comes in, it is
intercepted by this hook.
2012-06-26 14:10:42 -07:00
John McLear
e4ff4021ab
Merge pull request #810 from redhog/aceEditEvent
...
Plugin/hook features&bugfixes
2012-06-22 03:53:50 -07:00
Egil Moeller
476cfc8da0
Merge branch 'master' into aceEditEvent
2012-06-22 12:12:15 +02:00
Jordan Hollinger
6f37c0aaa6
The pad name sanitizer shouldn't drop query params. issue #779
2012-06-13 15:20:29 -04:00
0ip
48daf83a30
#763 : Use spaces instead of tabs
2012-06-13 13:56:09 +03:00
Clark Boylan
2cbe29eb45
Fix pad.js' customStart.
...
Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
2012-06-12 14:20:54 -07:00
John McLear
0483802841
resolve issue #384 and also clear chat counter whenever focus is on chat input. Just a slightly nicer chat experience
2012-06-12 22:52:22 +02:00
Jordan Hollinger
23075138b9
Lock down npm version to avaoid bug in later version
2012-06-12 11:03:09 -04:00
Jordan Hollinger
486f7c904e
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
2012-06-11 23:33:17 -04:00
Jordan Hollinger
d5faefdeae
Bugfix to setPadHTML. resolves #764
2012-06-09 10:53:51 -04:00
Egil Moeller
3338db9485
Bugfixes
2012-06-05 13:32:33 +02:00
Egil Moeller
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +02:00
John McLear
dc678a458f
Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads
...
Timeslider realtimeupdate+readonly pads
2012-05-30 11:07:25 -07:00
Egil Moeller
ad68a6e3bf
Bugfix for Chads new toolbar styling
2012-05-30 17:41:43 +02:00
Egil Moeller
27f25b8c61
Added hook to catch edit events
2012-05-30 17:18:43 +02:00
Egil Moeller
357ca73a99
Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication.
2012-05-30 10:00:36 +02:00
Egil Moeller
15a7d24450
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
...
Conflicts:
src/node/handler/PadMessageHandler.js
src/static/css/pad.css
src/templates/pad.html
2012-05-29 21:26:12 +02:00
John McLear
dfd81b79d4
Merge pull request #738 from cweider/packaging
...
Packaging
2012-05-28 17:08:23 -07:00
Chad Weider
819fb76dcd
These definitions are meaningless.
2012-05-28 16:43:20 -07:00
Chad Weider
a28bbd0b3f
Definition will not have an effect if already defined - force redefinition.
2012-05-28 16:43:20 -07:00
Chad Weider
774e2a1517
Fix indentation.
2012-05-28 16:43:20 -07:00
John McLear
95b9cf4f62
Merge pull request #737 from cweider/packaging
...
Packaging
2012-05-28 15:28:50 -07:00
Chad Weider
a8340dfbbe
Remove the libraries that are a part of ace2_common package.
2012-05-28 15:14:52 -07:00
Chad Weider
7f9bfd6b26
Add comments to templates.
2012-05-28 15:14:52 -07:00
Chad Weider
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
Chad Weider
d5ac2bfb71
Explicitly require jQuery before using it.
2012-05-28 15:14:52 -07:00
Chad Weider
595fc5710e
Add ace2_common to bottom of the page includes.
2012-05-28 15:14:52 -07:00
Chad Weider
c4c30bf725
Correct parent_require path.
2012-05-28 15:14:51 -07:00
Chad Weider
299a90b3ba
Fix paths for ace files.
2012-05-28 15:14:51 -07:00
Chad Weider
9def552d3c
Remove trailing comma added in e661f653b1. Fixes #733 .
2012-05-28 14:40:08 -07:00
0ip
d4b4ca0a5c
Center user icon and fix overlapping chat
2012-05-23 20:40:24 +03:00
John McLear
26614bf2d5
You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594
2012-05-23 01:01:50 +02:00
John McLear
d1c2d12150
Import Should now work in IE
2012-05-23 00:52:10 +02:00
John McLear
dafa44e6b4
I hate how hacky this change is.
2012-05-23 00:51:03 +02:00
John McLear
b27287ce37
Update src/node/handler/ImportHandler.js
2012-05-23 00:49:12 +02:00
John McLear
c8b93f6ddc
Fix IE import
2012-05-23 00:46:56 +02:00
John McLear
9c6731f3b8
No comet required on landing page
2012-05-22 21:30:50 +02:00
Matthias Bartelmeß
06c36f3023
fix #722 by better argument checking in PadMessageHandler.js
2012-05-22 09:31:28 +02:00
0ip
185a3bface
Add def. bg to <select> and remove useless style
2012-05-20 20:19:16 +03:00
0ip
fe0ea23299
Fix userlist now showing up
2012-05-20 16:02:51 +02:00
0ip
caa56dd32a
Add non-floating popups
2012-05-20 15:59:51 +02:00
0ip
19cf43d0a3
Style select (useful for plugins)
2012-05-20 15:38:12 +02:00
0ip
750b9d44df
Style selected text
2012-05-20 15:37:03 +02:00
0ip
205797cd83
Remove class duplicate
2012-05-20 15:35:41 +02:00
0ip
fbee7dabcf
Add grouped buttons
2012-05-20 15:29:10 +02:00
0ip
afe060e2b8
Remove even more old code
2012-05-20 14:53:30 +02:00
0ip
0d68cd23ba
Remove old CSS code
2012-05-20 14:48:02 +02:00
John McLear
fbc2cb32b3
Merge pull request #705 from johnyma22/removeWordle
...
Remove wordle
2012-05-19 05:58:38 -07:00
John McLear
53bfc380af
Merge pull request #703 from cweider/remove-onclick
...
Remove onclick
2012-05-19 05:41:49 -07:00
Egil Moeller
9f46678e5d
Bugfix for IE and document.domain
2012-05-18 18:57:18 +02:00
John McLear
ee11338927
Merge pull request #709 from cweider/packaging
...
Packaging
2012-05-17 04:59:24 -07:00
Edy
e8639d87ce
fixes issue #707
...
Don't set cached cookies
2012-05-17 12:08:19 +02:00
Egil Moeller
fc946ffc33
Hide editing buttons when in readonly mode
2012-05-17 12:03:38 +02:00
Chad Weider
a9eb2d4e31
Fix ordering of editer code loading operations.
2012-05-14 19:01:00 -07:00
Chad Weider
9b0e2287aa
Add plugin framwork to common package.
2012-05-14 18:20:16 -07:00
Chad Weider
1a2c6425e1
Extract ace2_common into its own package.
2012-05-14 18:20:16 -07:00
Chad Weider
384523859e
Require ace2_common separately.
2012-05-14 18:20:16 -07:00
Chad Weider
97c7842d19
Remove unused line.
2012-05-14 18:20:16 -07:00
Chad Weider
4680bfaee8
Upgrade yajsml version.
...
Fixes parent-relative redirects and prints results more nicely.
2012-05-14 18:14:50 -07:00
Chad Weider
d65092e067
Move id, '*link' to the link.
2012-05-14 17:11:05 -07:00
Chad Weider
9942c577dc
Patch tablet styling.
2012-05-13 15:33:22 -07:00
Chad Weider
5d0c853889
Remove unnecessary styles.
2012-05-13 15:33:22 -07:00
Chad Weider
f802a79da6
Make styles less restrictive.
2012-05-13 15:33:22 -07:00
Chad Weider
818c3ef40d
Shift button appearance onto anchor.
2012-05-13 15:33:22 -07:00
Chad Weider
089e0227fd
Shift editbar styles around.
2012-05-13 15:33:22 -07:00
Chad Weider
1ea889bfab
Anchors are not icons
2012-05-13 15:33:22 -07:00
Chad Weider
2a3fce0cf1
The showusers control is an anchor.
2012-05-13 15:33:22 -07:00
Chad Weider
ab8b2cae21
Remove nonsense styles.
2012-05-13 15:33:22 -07:00
Chad Weider
dc0fb12b09
Remove onclick attributes from editbar.
2012-05-13 15:33:22 -07:00
John McLear
def904dbed
remove wordle
2012-05-13 20:20:18 +01:00
John McLear
916e52a1eb
Merge pull request #609 from prauscher/disable-passwords
...
Disable passwords
2012-05-13 06:55:47 -07:00
John McLear
c70d88eedc
Merge pull request #667 from fourplusone/feature/cleaner_code
...
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
2012-05-13 06:51:58 -07:00
0ip
99ecadc0c3
Fix #655 , wrong located APIKEY.txt
2012-05-13 00:34:26 +03:00
John McLear
476065b68d
Merge pull request #627 from edy-b/body-block
...
add more blocks to pad.html
2012-05-12 14:18:28 -07:00
0ip
c406d076de
Updated socket.io
2012-05-02 19:12:57 +03:00
Edy
47a257ff72
accidentally deleted an end block in last merge
2012-05-01 12:02:12 +02:00
Edy
1329e93639
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
...
Conflicts:
src/templates/pad.html
2012-05-01 11:35:06 +02:00
0ip
64db697558
Fixed typos
2012-04-30 16:54:19 +02:00
0ip
7a09d97731
Fix #683 - Disabling authorship colors doesn't work
2012-04-30 17:40:29 +03:00
0ip
23cdb2a5c6
Removed QR-Code
2012-04-30 15:54:21 +02:00
Edy
cf54c23228
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
...
Resolved conflicts:
src/templates/pad.html
2012-04-30 15:17:23 +02:00
0ip
96eb8ac004
100% is not needed here http://ragefac.es/416
2012-04-29 21:19:34 +03:00
John McLear
bf568b3477
Merge pull request #682 from fourplusone/fix/fix-677
...
fixed plugins.js
2012-04-29 11:13:45 -07:00
Matthias Bartelmeß
fa622857b9
fixed plugins.js
2012-04-29 20:12:15 +02:00
John McLear
122986798e
Merge pull request #681 from fourplusone/fix/fix-677
...
fixed socket.io in timeslider.js
2012-04-29 11:11:25 -07:00
Matthias Bartelmeß
cbb5a043b8
fixed socket.io in timeslider.js
2012-04-29 20:04:00 +02:00
John McLear
a73192b10d
Merge pull request #680 from fourplusone/fix/fix-677
...
Fix #677
2012-04-29 10:57:35 -07:00
Matthias Bartelmeß
0e941b498e
fix #677
2012-04-29 19:54:38 +02:00
John McLear
f6bdbddfcc
Merge pull request #679 from 0ip/highl_mod
...
Tidy up wobbly button highlighting code
2012-04-29 08:10:52 -07:00
0ip
2525f20ff4
Tidied up highlighting for currently opened module 2
2012-04-29 02:48:47 +02:00
0ip
4b272fe2e1
Tidied up highlighting for currently opened module
2012-04-29 01:00:31 +02:00
0ip
c11df112e8
templates/plugins.html Fixed relative paths
2012-04-28 22:00:15 +02:00
Egil Moeller
c173ebe197
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
2012-04-25 17:51:03 +02:00
Matthias Bartelmeß
513deef768
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
2012-04-25 10:23:58 +02:00
Egil Moeller
e559ef5640
Disable design mode in readonly pad
2012-04-23 16:41:41 +02:00
Egil Moeller
ba3430ebb7
Corect ReadOnly link
2012-04-23 16:20:55 +02:00
Egil Moeller
480d0b8e25
ReadOnly pad handling
2012-04-23 16:18:14 +02:00
Egil Moeller
ed7e254417
Disconnect handling and cleanup of unused code
2012-04-23 14:47:07 +02:00
Egil Moeller
e5a22423bb
Fixed timedelta problem
2012-04-23 14:20:17 +02:00
Egil Moeller
1faae5b756
Timeslider autoupdate on pad change
2012-04-23 13:29:27 +02:00
Egil Moeller
583743a3f9
Restored saved revision support
2012-04-23 12:58:04 +02:00
Egil Moeller
914d79ad20
Unified timeslider and pad editing protocol / component
2012-04-23 12:52:30 +02:00
Matthias Bartelmeß
18d0c81181
adding padutils to padmodals
2012-04-21 14:57:22 +02:00
Matthias Bartelmeß
a557f2414e
cssManager top is not used, so drop it
2012-04-21 13:47:11 +02:00
John McLear
d554420f57
Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing)
2012-04-21 01:23:13 +02:00
John McLear
3798f53f94
Merge pull request #660 from redhog/master
...
Unbreak last pull request (I forgot a dependency)
2012-04-20 16:21:04 -07:00
Egil Moeller
d08f3ff5ee
Bugfix dependencies
2012-04-21 01:17:27 +02:00
Matthias Bartelmeß
9d9b7b7b47
Merge branch 'develop' into feature/cleaner_code
2012-04-21 00:34:32 +02:00
John McLear
16edda7d46
luke warm fix.
2012-04-21 00:16:10 +02:00
John McLear
a5210ab27d
Merge pull request #647 from etinquis/fixes
...
Fix + New Hook
2012-04-20 15:10:40 -07:00
Matthias Bartelmeß
8fefb551fc
less verbose startup, better log messages at startup
2012-04-20 22:44:10 +02:00
Matthias Bartelmeß
7f50e8f551
server.js can be called from console.
2012-04-20 22:40:33 +02:00
Matthias Bartelmeß
c90ef5aeb8
default dirty.db to current pwd, so no new directory has to be created
2012-04-20 22:39:16 +02:00
Matthias Bartelmeß
e9fc16a974
warn if dirty db is used
2012-04-20 17:03:37 +02:00
Matthias Bartelmeß
90bbf169b2
allow startup without settings file
2012-04-20 17:03:26 +02:00
Matthias Bartelmeß
6fc45d6252
added etherpad-lite to "bin" in package.json
2012-04-20 17:00:32 +02:00
John McLear
b6be00c3ab
Merge pull request #659 from redhog/master
...
Oups, forgot a debug print in there in the last pull request
2012-04-20 06:12:34 -07:00
Matthias Bartelmeß
9691f02765
removing Minify.js.rej
2012-04-20 15:12:20 +02:00
Egil Moeller
9a67a3a1db
Removed debug print
2012-04-20 15:08:50 +02:00
John McLear
0a9fcc267f
Merge pull request #658 from redhog/master
...
Bugfixes for when plugins are installed as dependencies for other plugins
2012-04-20 05:56:57 -07:00
Egil Moeller
72c972b256
Bugfix for recursive dependency-installation and paths
2012-04-20 14:37:53 +02:00
Matthias Bartelmeß
89ab73c868
removing commented out functions from cssmanager.js
2012-04-20 14:25:07 +02:00
Matthias Bartelmeß
8593b1905c
getRepHTML seems to be unused. Removing
2012-04-20 14:24:44 +02:00
Matthias Bartelmeß
709a3b1dbe
removing debug code in collab_client.js
2012-04-20 13:34:35 +02:00
Matthias Bartelmeß
ab7f7506b9
removed unused functions in collab_client
2012-04-20 13:32:43 +02:00
Matthias Bartelmeß
07ee836946
set view zoom is unused
2012-04-20 12:19:09 +02:00
Matthias Bartelmeß
e661f653b1
sharebox and Feedback are not used. Removing them
2012-04-20 12:15:09 +02:00
Matthias Bartelmeß
23bbe4ab5a
undo-xpopup seems to be unused
2012-04-20 12:04:10 +02:00
Matthias Bartelmeß
f809b0d6c8
removing de-facto noop
2012-04-20 12:03:11 +02:00
0ip
a743112170
Fix #626 , Plugins don't work if pad is on a subdir
2012-04-19 19:44:44 +03:00
John McLear
4a7ab12859
Merge pull request #649 from rassie/patch-1
...
Corrected color picker: `jQuery(...).css('background-color')` returns…
2012-04-19 08:37:09 -07:00
John McLear
9fe8a7530d
Merge pull request #641 from 0ip/highlight_module
...
Fix | Highlight currently opened module
2012-04-19 08:23:51 -07:00
0ip
31909f6e60
Added viewport
2012-04-19 17:04:44 +02:00
0ip
ef88d2798e
Restore overwritten plugin manager UI
2012-04-19 17:00:29 +02:00
Egil Moeller
ecac40d062
Changed the authentication mechanism to support hooks
2012-04-19 16:04:03 +02:00
Egil Moeller
7b39da2d69
Bugfix for callFirst to actually call call hooks until it finds one that returns non-empty, which is actually usefull, as opposed to just calling one hook.
2012-04-19 16:03:42 +02:00
Nikolai Prokoschenko
576fe06682
Corrected color picker: jQuery(...).css('background-color') returns a hex notation in IE8 and rgb() in every other browser.
2012-04-19 16:44:19 +03:00
Egil Moeller
ac36a99a72
More general basic auth
2012-04-19 14:25:12 +02:00
Martyn York
da75b87d3c
added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe.
2012-04-18 14:44:25 -07:00
Egil Moeller
4c1d94343f
Better plugin admin interface
2012-04-18 13:43:34 +02:00
Egil Moeller
d6f476312d
Spelling bugfixes
2012-04-18 10:16:41 +02:00
Egil Moeller
7ab7ee9f5e
Plugin admin fixes
2012-04-17 22:40:53 +02:00
Egil Moeller
6f774bc6a5
Separated out the code for the plugin manager
2012-04-17 22:40:46 +02:00
Egil Moeller
f80f9fc59f
Merge commit 'd5120c9' into pita
2012-04-17 22:34:45 +02:00
Egil Moeller
3a62c6d2ab
Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange
2012-04-17 22:32:46 +02:00
0ip
d75aeeaf8f
pad_editbar adapated hacky highlighting of currently opened module to recent changes
2012-04-16 15:23:19 +02:00
0ip
3e47300587
template/pad.html removed id duplicates, moved revision button, converted TABS to spaces
2012-04-16 15:19:53 +02:00
0ip
9cbb897c45
template/pad.html removed some whitespace
2012-04-16 15:13:07 +02:00
John McLear
7cf4510bf5
Merge pull request #637 from fourplusone/feature/timeslider_cleanup
...
Feature/timeslider cleanup
2012-04-15 12:11:46 -07:00
Matthias Bartelmeß
e664320b8c
removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere
2012-04-15 19:25:23 +02:00
Matthias Bartelmeß
d834c42ffc
avoid missing anon. timeslider authors
2012-04-15 19:18:29 +02:00
Jordan Hollinger
06f36664b8
Fix re-enabling line numbers. issue #618
2012-04-13 17:21:07 -04:00
Jordan Hollinger
362ef454b8
Don't block static paths with http auth
2012-04-13 05:17:48 -04:00
Edy
f4be70c45e
add more blocks to pad.html
...
... to allow plugins to be more flexible extending etherpad
2012-04-12 20:24:38 +02:00
0ip
8fa54e2402
admin interface styling and sensibility
2012-04-11 19:44:18 +02:00
Chad Weider
e695c716e5
Work around strange order of execution bug in Firefox. Fixes #620
2012-04-11 02:08:50 -07:00
Chad Weider
b767192c58
Revert "Made it possible to disable minification again"
...
This reverts commit 22eaa6ffc0
2012-04-11 02:08:50 -07:00
0ip
50c79df272
prefixed css files containing css3 attributes due to recently removed prefixfree.js
2012-04-09 17:52:43 +02:00
0ip
77936c6c12
removed a weird plus
2012-04-09 18:42:09 +03:00
John McLear
f9d8cea114
Merge pull request #612 from levu42/bug-user-scroll
...
Userlists now scrolls if there are too many users
2012-04-09 06:37:03 -07:00
0ip
c3095bbd1b
improved userlist ux (prevent overlapping of objects)
2012-04-09 15:16:40 +02:00
John McLear
18038ddd50
Merge pull request #614 from fourplusone/ace2_refactoring
...
Adding more hooks + some code refactoring
2012-04-08 17:28:47 -07:00
Matthias Bartelmeß
c3ce00a82d
added a comment on skiplist.js
2012-04-08 21:21:52 +02:00
Matthias Bartelmeß
b7a0b36b5e
...well stupid error
2012-04-08 21:21:30 +02:00
Matthias Bartelmeß
2406800cd6
documentation on AttributeManager
2012-04-08 21:21:05 +02:00
Patrick Rauscher
867cc94806
bugfix for some crashes through stack overflows
2012-04-08 17:48:30 +00:00
levu
9e063341ce
fix for bug 'userlist not scrolling'
2012-04-08 16:22:00 +02:00
Patrick Rauscher
0e7cb78ec2
Allow disabling Passwords by setting them to an empty string
2012-04-07 13:41:00 +00:00
Patrick Rauscher
6da38fd8bc
bugfix to use the API again
2012-04-07 13:40:02 +00:00
Matthias Bartelmeß
62c9b1c25e
Merge branch 'fix/list-removal' into ace2_refactoring
2012-04-07 10:26:21 +02:00
Matthias Bartelmeß
8be1deda6f
Merge branch 'develop' into fix/list-removal
2012-04-07 03:42:16 +02:00
Matthias Bartelmeß
18dc111010
Fixing bug where lists get deleted when pressing enter
2012-04-07 03:42:05 +02:00
Matthias Bartelmeß
1e8e071693
Merge commit '57e137f65bd5152c0c2dc8508c796674d3289545' into ace2_refactoring
2012-04-07 02:14:43 +02:00
Matthias Bartelmeß
2db74150ee
linestylefilter now uses attributemanager to find lineattributemarkers
2012-04-07 02:14:19 +02:00
Matthias Bartelmeß
a0235126e4
syntax candy
2012-04-07 02:13:26 +02:00
Matthias Bartelmeß
6507614e45
made domline and content collector lineAttributes compatible
2012-04-07 02:12:42 +02:00
John McLear
57e137f65b
Merge pull request #599 from fourplusone/ace2_refactoring
...
ACE2 refactoring
2012-04-06 17:07:49 -07:00
Matthias Bartelmeß
9efe838a32
removed unused variable
2012-04-07 01:57:10 +02:00
Matthias Bartelmeß
c79593569a
added aceEditorCSS hook
2012-04-07 01:40:13 +02:00
Matthias Bartelmeß
34f07efcfb
Delete key removes line attributes if prev line is not emtpy
2012-04-07 01:07:25 +02:00
Matthias Bartelmeß
38276e636c
postAceInit passes ace instance
2012-04-07 01:06:29 +02:00
Matthias Bartelmeß
0340c87996
Pad message handler detects lineattributemakers by asking Attribute manager
2012-04-07 01:05:25 +02:00
Matthias Bartelmeß
7418f08dc7
Added 2 new Hooks
...
+ aceInitialized is called when ace has been fully initialized
+ aceRegisterBlockElements allows to register new Block Elements with ace.
2012-04-07 01:02:50 +02:00
0ip
ae21eb30dd
Deselect highlighted editbar module button when userlist is opened
2012-04-06 22:32:19 +03:00
Matthias Bartelmeß
81f14fa157
Merge branch 'develop' into ace2_refactoring
2012-04-06 17:49:16 +02:00
Matthias Bartelmeß
39d0b149a9
corrected documentation on Attribute Manager
2012-04-06 17:44:34 +02:00
John McLear
7766f8aaad
Merge pull request #591 from fourplusone/timeslider_authors
...
Timeslider authors
2012-04-05 16:38:55 -07:00
Matthias Bartelmeß
d61cdf57cc
Merge branch 'develop' into ace2_refactoring
2012-04-05 22:28:16 +02:00
Matthias Bartelmeß
9b1536ac10
fixing 'rep is not defined' error
2012-04-05 22:26:39 +02:00
Matthias Bartelmeß
151f1a0d71
Merge branch 'develop' into timeslider_authors
2012-04-05 21:54:26 +02:00
Matthias Bartelmeß
404ce9e452
css fixes
2012-04-05 21:53:04 +02:00
Matthias Bartelmeß
9e042ee942
Merge branch 'develop' into timeslider_authors
...
Conflicts:
src/static/css/pad.css
src/templates/timeslider.html
2012-04-05 21:47:59 +02:00
Egil Moeller
a3c9407ed6
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-04-05 20:14:48 +02:00
johnyma22
d5120c98d0
very quick admin interface styling and sensibility
2012-04-05 18:22:53 +01:00
johnyma22
66fdacf9cf
move css out of html
2012-04-05 18:04:17 +01:00
johnyma22
28aeb24f86
add some sense to the buttons on the plugin page
2012-04-05 18:00:38 +01:00
johnyma22
d3cc8e3374
Make the console show the url that admin/plugins is available at
2012-04-05 17:49:03 +01:00
Matthias Bartelmeß
ff9e407092
Minor coding style improvement. Does the same as before
2012-04-05 15:26:51 +02:00
Matthias Bartelmeß
2ccc70daf6
documented lineAndColumnFromChar
2012-04-05 15:25:17 +02:00
Matthias Bartelmeß
5833cb1037
renamed performDocumentApplyAttributesToRange to setAttributesOnRange and moved it to AttributeManager
2012-04-05 15:22:22 +02:00
Matthias Bartelmeß
093b7ab4bf
added lineMarkerAttribute + more comments
2012-04-05 15:20:48 +02:00
Egil Moeller
8cd1298a16
Added init hook to install plugin database default content and the like
2012-04-05 01:48:12 +02:00
Egil Moeller
4325f0b907
Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff
2012-04-05 01:45:14 +02:00
Matthias Bartelmeß
9f02972af4
remove debugger statement
2012-04-05 01:08:01 +02:00
Matthias Bartelmeß
60942b09a4
fixing lineHasMarker
2012-04-05 01:07:47 +02:00
Matthias Bartelmeß
1b383dc9b8
Merge branch 'develop' into ace2_refactoring
2012-04-05 00:51:18 +02:00
Matthias Bartelmeß
23cda77b65
added AttributeManager, ChangesetUtils
2012-04-05 00:50:04 +02:00
Matthias Bartelmeß
137e06d52b
Merge branch 'develop' into fix/max-age
2012-04-04 17:42:08 +02:00
Matthias Bartelmeß
5c4551b098
remove maxAge: undefined header, send maxAge even if set to 0
2012-04-04 17:41:03 +02:00
Matthias Bartelmeß
6c647baa02
Merge branch 'fix/client_plugins' into ace2_refactoring
2012-04-04 15:13:07 +02:00
Matthias Bartelmeß
f34e13f761
on plugin definitions, only expose plugins with client_hooks registered. dont expose 'package' property
2012-04-04 15:10:27 +02:00
