libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3120 commits 2 branches 0 tags 24 MiB
Commit graph

69 commits

Author SHA1 Message Date
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
56275d8de7 longer timeout on reconnection 2013-04-02 12:20:38 -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
John McLear
0063933041 fix cookies 2013-03-23 02:59:12 +00:00
John McLear
4ea7ccd104 merge develop 2013-03-20 01:11:27 +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
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
Marcel Klehr
760e1b82c3 Add a setting for RTL text direction (integrating the url paramter) 
Fixes #1191
 2013-03-05 23:12:00 +01: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
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
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
mluto
a239158b49 Renamed paramSettings to getParameters, to cause less confusion 2013-01-28 20:17:34 +01:00
mluto
7432b7aff9 Rewrote getParams() to be more dynamic and shorter 2013-01-27 11:02:15 +01:00
mluto
bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto
5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES 2013-01-07 17:36:03 +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
Marcel Klehr
6446281254 Migrate lang picker and embed param to html10n.js 2012-12-23 18:16:32 +01: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
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
root
84d154b168 Update strings, add UK strings, fix JS 2012-12-03 11:35:06 +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
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
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
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
c2253e49b6 Add ability to set language via URL parameter 2012-11-12 18:31:02 +01:00
Marcel Klehr
7021a8b885 Add pad setting for UI lang 2012-11-12 16:49:15 +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
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
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
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
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
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
Wikinaut
85f5eb38e4 fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled 2012-08-16 01:00:36 +02:00
Marcel Klehr
9aed433ad5 Fix #880 Remove call to padsavedrevs.handleIsFullyConnected 2012-07-18 15:54:53 +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
53bfc380af Merge pull request #703 from cweider/remove-onclick 
Remove onclick
 2012-05-19 05:41:49 -07:00