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
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
Simon Leblanc
94e9cf0a32
improving the translation of the timeline
2012-11-23 06:20:09 +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
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
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
8a23c2ff50
Use ; as comments indicator in i18n files
2012-11-20 22:08:42 +01:00
0ip
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01: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
Marcel Klehr
993d501943
Make L10n.js requireable
2012-11-12 17:42:07 +01:00
Marcel Klehr
7021a8b885
Add pad setting for UI lang
2012-11-12 16:49:15 +01:00
Marcel Klehr
a3504f70c4
Add i18n component
2012-11-10 14:12:17 +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
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
b6a331b9ec
Merge pull request #1120 from Pita/feature/settings-admin
...
Modify Server Settings in /admin/settings
2012-11-05 04:48:59 -08: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
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
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
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
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
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
Chia-liang Kao
8199bf8377
Do not assume window object exists
2012-10-23 15:21:05 +08: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
NAGOYA, Yoshihiko
957a0aa873
fix Pita/etherpad-lite #1032
...
refact inInternationalComposition
2012-10-12 01:12:15 +09: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
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
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
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
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
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
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
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
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
John McLear
32b4729305
Merge pull request #987 from cweider/loopback-avoidance
...
Windows server fixes
2012-09-09 15:50:42 -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
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
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
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
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
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
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
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
9d25dcc1f9
Merge branch 'develop' into feature/connectivity-toolbar
...
Conflicts:
src/templates/pad.html
2012-07-23 11:26:15 +02:00
Marcel Klehr
9aed433ad5
Fix #880 Remove call to padsavedrevs.handleIsFullyConnected
2012-07-18 15:54:53 +02: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
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
