Commit Graph

895 Commits

Author SHA1 Message Date
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 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
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
Robin 62acab961f added missing class for settings button 2012-01-29 17:03:33 +01:00
Robin ddcaf0dad6 Moved inline css to pad.css and made popups even more dynamic 2012-01-29 16:57:06 +01:00
John McLear 30e644ee0f Merge pull request #372 from cweider/button-styling
Shift button styling specifics into CSS.
2012-01-29 07:15:51 -08:00
Chad Weider a408557a0e Make implicit loading of modules unnecessary.
This is one step on the way to simplifying `Minify` and allowing all of the modules within pad.js to be loaded independently in development mode (which is useful for debugging).
2012-01-28 23:11:54 -08:00
Chad Weider 6a4c025e08 Global exception handler is not registered until the page's controller adds it.
It is bad form to register this handler on definition. This would cause problems if, for instance, this module was required by our Node code.
2012-01-28 22:35:38 -08:00
Jordan 01cacff008 Convert goToPad to middleware 2012-01-28 21:51:25 -05:00
Chad Weider c12e1aff07 Place script at bottom. 2012-01-28 18:42:50 -08:00
Chad Weider 67e6f9fa5a Move timeslider code into JS. 2012-01-28 18:42:49 -08:00
Chad Weider d934fd6107 Remove all global dependencies from broadcast modules. 2012-01-28 18:40:56 -08:00
Chad Weider bdf0f203f9 Shift button styling specifics into CSS. 2012-01-28 15:12:21 -08:00
Chad Weider cd86ef5600 Shift pad initialization into JavaScript. 2012-01-28 14:48:53 -08:00
Chad Weider 3e9b56aa75 Give controller for pad.html a more appropriate name. 2012-01-28 14:48:53 -08:00
Chad Weider 514698162f Inject pad dependencies into most pad submodules. 2012-01-28 14:48:53 -08:00
Chad Weider 56c07e484a Expose settings on pad object. 2012-01-28 14:48:53 -08:00
John McLear e68643b67e Comment out some of the sidebar code that is no longer used and add a cookie set and get for sticky chat view 2012-01-28 22:24:14 +00:00