Commit Graph

1324 Commits (d69df917095c49e9cc98e13e98e9af2b78cb59b7)

Author SHA1 Message Date
John McLear d69df91709 use val not value, broken with newer jq 2013-10-03 00:36:15 +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
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