Commit graph

90 commits

Author SHA1 Message Date
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