Commit Graph

1554 Commits (44cb676ba2a93d08e218447c07e5928c53ed1beb)

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