Chad Weider
e68413d998
Extract Ace.js file generation.
2012-02-05 16:59:40 -08:00
John McLear
cbe0b6d6bb
Merge pull request #404 from cweider/misc-fixins
...
Misc fixins
2012-02-05 15:06:41 -08:00
Chad Weider
3678625c7c
Remove dependencies on native map.
2012-02-05 13:59:35 -08:00
Chad Weider
f010f3ae9d
Remove redundant line.
2012-02-05 13:59:34 -08:00
Chad Weider
b1d871d0fd
Defer socket setup until initialization and on document ready.
...
Code at the top level of a module should be related to definition only. Things that execute code should be inside of initialization methods. All evidence suggests that the binding to `window.onload` was arbitrary, and that this can be done as soon as the document is ready with no ill-effects.
2012-02-05 13:55:35 -08:00
Chad Weider
3fb62956b9
Plugins are injected and no longer exist in the global scope.
2012-02-05 13:46:56 -08:00
Peter 'Pita' Martischka
e3b6072e77
Merge pull request #403 from cweider/fix-jquery
...
Fix version check for jQuery 1.7.1 download.
2012-02-05 13:43:26 -08:00
Chad Weider
7a03405bb0
Fix version check for jQuery 1.7.1 download.
...
This corrects 3d108d6dce
2012-02-05 13:40:19 -08:00
John McLear
8ade4c89d5
Merge pull request #400 from elijh/master
...
minor spelling fix
2012-02-05 06:25:42 -08:00
John McLear
200346ee5d
Allow parameter to be passed to always show cha ton side of screen
2012-02-05 14:23:01 +00:00
elijah
17e9cf71da
use english spelling: replace costumStart with customStart.
2012-02-04 15:22:25 -08:00
John McLear
82bda0b0ab
Merge pull request #398 from 0ip/vendor_pref
...
Get rid of these idiotic vendor prefixes
2012-02-04 09:57:12 -08:00
Robin
dd9989c32a
fixes automatic update
2012-02-04 18:46:43 +01:00
Robin
eb24404d3d
automatic prefixfree.js dl
2012-02-04 18:37:36 +01:00
Robin
adc58cdcaf
add missing slash
2012-02-04 18:11:41 +01:00
Robin
7075ff6731
get rid of vendor prefixes
2012-02-04 18:08:04 +01:00
John McLear
28c9a422ff
Merge pull request #395 from 0ip/patch-4
...
Update jQuery to 1.7.1
2012-02-04 08:49:47 -08:00
John McLear
894ff56611
Merge pull request #396 from 0ip/ui_dialog_hl
...
Mark UI button of currently 'open' dialog
2012-02-03 17:22:44 -08:00
John McLear
3599ea258a
Merge pull request #397 from 0ip/removejqui
...
Remove jQuery UI [finally]
2012-02-03 17:20:59 -08:00
Robin
28386adbbb
Scroll down
2012-02-03 22:52:57 +01:00
0ip
a8cc61545c
Prevent that li.sepereator gets .selected
2012-02-03 22:29:43 +01:00
Robin
79794c0572
remove unnecessary module
2012-02-03 21:45:25 +01:00
Robin
f3531f3f63
fix css
2012-02-03 21:32:36 +01:00
Robin
1c826da1d1
rem jQ-UI from pad.js too
2012-02-03 21:28:19 +01:00
Robin
bb808d11ac
remove jquery ui
2012-02-03 21:20:02 +01:00
Robin
82b04df085
overwrite existing bg
2012-02-03 20:48:47 +01:00
Robin
2adda472fc
Highlight button for currently opened dialog
2012-02-03 20:43:09 +01:00
0ip
3d108d6dce
Update jQuery, removes "event.layerX/layerY are broken and deprecated in WebKit" message
2012-02-03 19:20:32 +01:00
Peter 'Pita' Martischka
8d7ec7d24a
Merge pull request #390 from booo/master
...
fix for issue #389
2012-02-02 04:17:33 -08:00
Peter 'Pita' Martischka
fc0cbdb55c
Updated uglify-js, that might fixes #389
2012-02-02 12:24:13 +01:00
booo
3f3bb95073
Revert "Optimize javascript minification, slight increase of file size, but massive performance improvement"
...
This reverts commit b32f883a9d
2012-02-02 11:26:36 +01:00
John McLear
dfa106df03
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-31 14:16:01 +00:00
John McLear
9d72ddfbc7
Solves first part of #377 -- Swap order of title and pad name
2012-01-31 14:15:36 +00:00
Peter 'Pita' Martischka
be1bd1d12d
Merge pull request #381 from booo/master
...
remove joose as dependency
2012-01-31 05:51:55 -08:00
Peter 'Pita' Martischka
b32f883a9d
Optimize javascript minification, slight increase of file size, but massive performance improvement
2012-01-31 13:27:46 +01:00
John McLear
9ed42ac801
Merge pull request #382 from cweider/fixes
...
Fixes
2012-01-30 15:29:11 -08:00
Chad Weider
23a166ca99
JSON exports itself. This fixes issue #376 .
2012-01-30 15:26:30 -08:00
Chad Weider
f83e619fd9
Null-out the padeditor's reference to ace once it has been distroyed.
...
This enables the guards placed in `padeditor.disable` to work. On `window.unload` the pad's connection would get closed which would lead to the editor becomming disabled. If the editor had already been `disposed` then the call to `disable` would raise the exception:
`Uncaught TypeError: Cannot call method 'ace_setProperty' of null`
2012-01-30 15:23:54 -08:00
John McLear
cd36849dc3
Merge pull request #380 from jhollinger/master
...
CSS bugfixes
2012-01-30 07:56:28 -08:00
booo
0c723c2686
remove joose dependency
2012-01-30 15:59:13 +01:00
Jordan
f69a2cca3c
CSS bugfix to two-column popups - the right column was too wide and was being pushed below the left column
2012-01-30 08:20:02 -05:00
Jordan
ac41acd52b
CSS bugfix to export popup in timeslider
2012-01-30 08:12:14 -05:00
booo
a13ff6eabf
Merge branch 'master' of https://github.com/Pita/etherpad-lite
2012-01-30 13:47:28 +01:00
Peter 'Pita' Martischka
aeea061f69
Merge pull request #366 from booo/master
...
move randomString function into a module
2012-01-30 01:58:28 -08:00
Peter 'Pita' Martischka
4d714cee94
Merge pull request #371 from cweider/page-initialization
...
Page initialization
2012-01-30 01:56:02 -08:00
Peter 'Pita' Martischka
2aba2db937
Merge pull request #373 from jhollinger/master
...
Convert goToPad to middleware
2012-01-30 01:45:36 -08:00
booo
d4e677cc00
Merge branch 'master' of https://github.com/Pita/etherpad-lite
2012-01-30 01:04:29 +01:00
John McLear
7096ce7f1e
Fix #171 IE9 edit issue and #361 IE URL Last Letter issue
2012-01-29 18:41:33 +00:00
John McLear
3287a0000a
Merge pull request #349 from marcelklehr/master
...
Make text color change depending on luminosity of author color
2012-01-29 08:39:54 -08:00
John McLear
fdc44e65c8
Merge pull request #375 from 0ip/cssfix
...
No more inline CSS + added missing class for settings button
2012-01-29 08:39:29 -08:00
