Stefan
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02:00
Stefan
93dae51cda
Remove test cookie
2016-06-08 21:12:27 +02:00
Brian Lim
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
John McLear
50c6b5ed61
tidy up
2016-01-10 14:39:41 +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
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
Stefan
856fc5975b
Fix broken switchToPad method
2015-08-05 18:23:54 +02:00
goldquest
32ba48835a
if variable not declared, test if null throws error
2015-06-17 18:54:19 +02: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
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
3b91b46baa
always hide connected one second after connected
2015-05-10 11:46:49 +01:00
John McLear
48c2b7cde1
fixes #2570
2015-05-05 20:41:40 +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
41bb4ef094
support for open dyslexic font
2015-04-05 14:03:09 +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
f9071aebe6
fix issue with showControls false not working
2015-03-30 14:56:35 +01: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
John McLear
753e8fdf0b
working logic
2015-01-21 16:08:54 +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
f2891e3b8b
working
2015-01-21 14:55:29 +00:00
John McLear
34d6b31c98
some sanity
2015-01-21 13:24:21 +00:00
John McLear
63c65f784b
semi working example
2015-01-19 01:45:49 +00: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
248d7655d7
Merge pull request #2401 from ether/save-prefs
...
set prefs and get prefs
2014-12-29 01:01:09 +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
Gared
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
John McLear
a151c207c2
set prefs and get prefs
2014-12-27 15:08:54 +01:00
Simon Gaeremynck
45c1ad078b
Allow for shardable Etherpad
2014-12-09 14:59:18 +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
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +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
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
a22b558a2c
change to proper IE check
2014-11-01 20:21:48 +00: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
Mike DeRosa
070ba40f4f
Fallback for browsers that don't support window.history.pushstate
2014-07-06 18:22:24 -04: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
John McLear
e1fa43e640
quick formatting clean up
2014-03-17 19:20:32 +00:00
John McLear
d69df91709
use val not value, broken with newer jq
2013-10-03 00:36:15 +01: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
goldquest
896f72311f
use document, not doc
2013-04-17 16:51:54 +02: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
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
Egil Moeller
fc946ffc33
Hide editing buttons when in readonly mode
2012-05-17 12:03:38 +02:00
Chad Weider
dc0fb12b09
Remove onclick attributes from editbar.
2012-05-13 15:33:22 -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
