Commit Graph

3413 Commits

Author SHA1 Message Date
John McLear 58bbfd8a65 resolve merge conflict 2013-12-09 21:55:04 +00:00
John McLear 24e96c4f8b Merge pull request #2028 from webzwo0i/remove-deadcode
Remove deadcode
2013-12-09 10:49:57 -08:00
John McLear 438f3fc717 Merge pull request #2030 from ether/import_hook
Working import hooks
2013-12-09 10:22:40 -08:00
John McLear 3180b96213 Remove console logs 2013-12-09 18:13:07 +00:00
John McLear 505dc70df5 Merge pull request #2013 from ether/getAttributeOnSelection
getAttributeOnSelection function
2013-12-09 09:46:57 -08:00
John McLear bae77666a4 Merge pull request #2027 from webzwo0i/fix-import
fix closing of </title> tag
2013-12-09 06:56:22 -08:00
webzwo0i 77cf2aafac [pad_modals] remove unused variables. for the hide/show functions jquery's default variables are used everywhere 2013-12-08 17:35:11 +01:00
webzwo0i 9400425b1e [virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused 2013-12-08 17:33:58 +01:00
webzwo0i ab797c9831 [pad_connectionstatus] padeditbar is not used anywhere in pad_connectionstatus 2013-12-08 17:31:46 +01:00
webzwo0i 906ab1820b [timeslider] do not include underscore, as its not (longer) used 2013-12-08 17:31:18 +01:00
webzwo0i 1fa8c2a7e6 [collab_client] remove unused function getStats 2013-12-08 17:30:48 +01:00
webzwo0i 6aaf4c4065 [collab_client] remove keys function, which was not used and variable reconnectTimes which was used for some long gone disconnect tracking code 2013-12-08 17:30:25 +01:00
webzwo0i aadcfbb3d1 do not send globalPadId in clientvars - its not used anywhere 2013-12-08 17:29:41 +01:00
webzwo0i ca6f877db2 [padDiff] remove unused functions a?lines_length 2013-12-08 17:28:43 +01:00
webzwo0i 021db28a02 [Changeset] a?lines_length was not used within inverse function 2013-12-08 17:27:48 +01:00
webzwo0i e04f46d477 [ace2_inner] init() has replaced setup(), reflect this change in the comments and remove the unused setup() 2013-12-08 17:25:12 +01:00
webzwo0i 020bd3915c remove empty&unused overlaysdiv 2013-12-08 17:24:12 +01:00
webzwo0i 4dd3584532 [ace2inner] remove unused function boldColorFromColor 2013-12-08 17:22:55 +01:00
webzwo0i a714f63597 [ace2inner] remove unused recolorLineByKey that was part of old recolor module 2013-12-08 17:22:20 +01:00
webzwo0i 3dc844eb08 [ace2_inner] remove unused getLineKeyForOffset that was part of old recolor module 2013-12-08 17:21:53 +01:00
webzwo0i eee355979d [ace2_inner] remove unused function htmlForRemovedChild 2013-12-08 17:21:27 +01:00
webzwo0i 8175af3017 [collab_client] remove socketid because its not used 2013-12-08 17:20:53 +01:00
webzwo0i f25fed1c25 [ace2_inner] remove incorpIfQuick because its unused since July 2013-12-08 17:15:38 +01:00
webzwo0i 4044d5ae47 remove hidden input field padId which is send on every import but not used 2013-12-08 17:14:01 +01:00
John McLear d9ef40f9d7 docs but not sure how to specify the verison this was introduced 2013-12-07 17:48:06 +00:00
John McLear 8a547b24ba resolve issue where first char showed all formatting 2013-12-07 17:37:52 +00:00
John McLear 98c4e32a14 Merge pull request #2026 from ether/afterEditHook
after Edit eejs block
2013-12-07 08:55:04 -08:00
webzwo0i 01c71085e4 fix closing of </title> tag 2013-12-07 00:18:36 +01:00
Siebrand Mazeland 03d5acfd0c Localisation updates from https://translatewiki.net. 2013-12-05 22:01:36 +00:00
Marcel Klehr 37442d301c Merge pull request #2021 from ldidry/fix-no-tab-indent
Replace tabs indentation with spaces indentation
2013-12-05 06:22:33 -08:00
Marcel Klehr 60017e9190 Merge pull request #2019 from ether/lighter-colors
allow for lighter colors
2013-12-05 05:42:14 -08:00
Luc Didry 3d8452b143 Replace tabs indentation with spaces indentation
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear 20b27c602c Merge branch 'afterEditHook' of github.com:ether/etherpad-lite into getAttributeOnSelection 2013-12-04 23:36:26 +00:00
John McLear 749e557b84 after Edit eejs block 2013-12-04 23:17:32 +00:00
John McLear 378e07964b allow for lighter colors 2013-12-04 23:01:08 +00:00
John McLear 03ff5563f4 Merge pull request #2017 from eloydegen/master
Update pad.html
2013-12-02 08:21:38 -08:00
Eloy de3a657c6b Update pad.html
Select the URL when click at the text.
2013-12-02 16:43:52 +01:00
Siebrand Mazeland f2e63df9cb Localisation updates from https://translatewiki.net. 2013-12-02 08:26:08 +00:00
John McLear 30f577e8f4 dont assume formatting is on the start of any line 2013-12-01 20:01:17 +00:00
John McLear 95db100f12 remove white space 2013-12-01 18:56:05 +00:00
John McLear 39f81fdb9e remove post ace event 2013-12-01 18:55:42 +00:00
John McLear 3791ad4186 ends of line shouldn't show incorrect formatted status 2013-12-01 18:54:46 +00:00
John McLear b4877f002d handle logic for line lengths with 0 2013-12-01 18:06:56 +00:00
John McLear e9f7583793 some nice css to that reflect when a button is active 2013-11-28 17:44:37 +00:00
John McLear dee2dab7c4 getAttributeOnSelection function 2013-11-28 17:27:52 +00:00
John McLear 271dd663bf foo 2013-11-28 17:22:34 +00:00
John McLear 6fcc7c77f9 not working and erally confused 2013-11-27 00:23:11 +00:00
John McLear 1fa2b32854 Merge pull request #1999 from s1341/fix_json_is_bad
strip off trailing commas
2013-11-26 05:16:42 -08:00
s1341 5181b3e467 add josnminify to package.json 2013-11-26 10:28:33 +02:00
s1341 9b7203d4d2 have the server parse the settings file using minify and strip commas 2013-11-26 10:20:59 +02:00