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

3319 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
John McLear
4de986a1ae Merge pull request #1877 from piratenfraktion-nrw/develop 
allow users to have colons in password
 2013-09-10 09:07:44 -07: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
John McLear
1aa5981ce3 Update README.md 2013-09-02 13:56:17 +01:00
Marcel Klehr
e6dd23c282 Merge pull request #1861 from codingisacopingstrategy/correct-path-in-readme-doc-generator 
Correct the path to the docs file used by the doc generator
 2013-09-01 02:29:34 -07:00
Marcel Klehr
ed77bffbab Merge pull request #1869 from codingisacopingstrategy/clarify-how-to-access-tests 
Clarify how to acces tests
 2013-09-01 02:28:21 -07:00
Eric Schrijver
384f500d4c Clarify how to access tests 
Add @marcelklehr’s clarification in https://github.com/ether/etherpad-lite/issues/1859
 2013-09-01 11:23:31 +02:00
John McLear
20ae3b333b Merge pull request #1868 from codingisacopingstrategy/encoding-fix-localization-dot-md 
Fix encoding issue in localization.md
 2013-09-01 02:01:10 -07:00
Eric Schrijver
4377f7a2e4 Fix encoding issue in localization.md 2013-09-01 10:57:31 +02:00
Eric Schrijver
286e592f91 Correct the path to the docs file used by the doc generator 2013-08-23 00:56:58 +02:00
Michael Parks
dc2418e532 Start script needs bash instead of sh for root arguments 2013-08-15 11:06:48 -06: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
John McLear
78820b8572 Merge pull request #1841 from ether/update/html10n.js 
Update html10n.js
 2013-07-23 03:52:40 -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
d4e67cdc9a Merge pull request #1837 from rgbkrk/patch-1 
Grammar fix
 2013-07-18 11:53:39 -07:00
Kyle Kelley
406c9e38ea Grammar fix 2013-07-18 13:44:13 -05: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
5688350bf1 Adapt and add slowness test from @JohnMcLear. 
- The test now ensures that all three key events are fired when
  sending keys. Previously, only the 'keypress' event was sent,
  which failed to trigger very slow code on webkit browsers (as
  it is triggered by 'keyup'). All three events should really be
  sent whenever sending keys to the browser to ensure that we're
  adequately testing real behavior. See the 'sendkeys' plugin
  for more; it only sends 'keypress'.
 2013-07-14 16:46:12 -04: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
4ceb2c2e86 Update README.md 2013-07-01 19:54:51 +01:00
John McLear
d5a3d9d03b Update README.md 2013-07-01 19:54:09 +01:00
John McLear
fb917b3d78 Update LICENSE 2013-06-26 23:34:35 +01: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
b1b6289eb3 Merge branch 'release/1.2.11' 2013-06-24 13:36:41 +01:00
John McLear
ba1a5da76d bump and changelog 2013-06-24 13:35:17 +01:00
John McLear
306c4047ea Fix broken git guide link 2013-06-23 16:09:08 +02: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