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

934 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
9c9e5db72d Add ability to export specific pad revisions 
Conflicts:

	node/utils/Minify.js
	node/utils/Settings.js
	static/css/timeslider.css
	static/js/pad_impexp.js
	static/timeslider.html
 2012-03-29 19:40:55 +01:00
Peter 'Pita' Martischka
8e6b451459 Merge pull request #424 from booo/master 
update clean-css version
 2012-02-07 08:02:39 -08:00
booo
edfdb775fe package.json: upgrade clean-css package 2012-02-07 16:59:19 +01:00
John McLear
e74c9e1bc9 Merge pull request #420 from cweider/fix-colorpicker 
Fix colorpicker
 2012-02-06 12:56:37 -08:00
Chad Weider
b59c8a0c7e Fix #419: closeColorPicker is not defined. 
Events are attached in script, so drop onclick attribute and use button to preserve interactivity.
 2012-02-06 12:39:37 -08:00
Chad Weider
2f32f5a6aa IE does not support index of. 2012-02-06 12:36:45 -08:00
John McLear
1df0cb5c34 Merge pull request #411 from marcelklehr/master 
Font color isn't white on timeslider
 2012-02-06 11:08:53 -08:00
Peter 'Pita' Martischka
394d542d5e fix jquery version regex to make @0ip happy 2012-02-06 17:36:59 +01:00
Peter 'Pita' Martischka
dfa857d606 Updated ueberDB 2012-02-06 17:29:27 +01:00
Marcel Klehr
c130a48d89 Text contrast adjustment for chat time 2012-02-06 16:16:31 +01:00
Marcel Klehr
9e769571fa Text contrast adjustment for timeslider 2012-02-06 16:00:42 +01:00
Marcel Klehr
169bae6cc9 Tweak contrast factor for author colors in editor 2012-02-06 16:00:08 +01:00
Peter 'Pita' Martischka
d7e29dba0d Merge pull request #405 from cweider/remote-modules 
Remote modules
 2012-02-06 03:57:20 -08:00
Peter 'Pita' Martischka
94b5998347 Merge pull request #407 from impulzia/master 
Fix for issue #406 (avoid check ssl certificate in curl with prefixfree)
 2012-02-06 03:35:24 -08:00
Pedro Gracia
7a41cde51f Add -k option in curl to check prefixtree to avoid check ssl certificate 2012-02-06 07:25:36 +01:00
Chad Weider
64ae1c433f Allow modules to be fetched remotely. 2012-02-05 16:59:40 -08:00
Chad Weider
b5ddba8741 Update require-kernel, it includes a patch for relative paths. 2012-02-05 16:59:40 -08:00
Chad Weider
762d39f009 Move scripts to the bottom of the page. 2012-02-05 16:59:40 -08:00
Chad Weider
3123a0a25a Do not assign to globals until after initialization. 2012-02-05 16:59:40 -08:00
Chad Weider
4bf9b0c805 Always include the require kernel. 2012-02-05 16:59:40 -08:00
Chad Weider
348e7ef1d5 Define packaging for iframe JS in the same way as pad.js and timeslider.js. 2012-02-05 16:59:40 -08:00
Chad Weider
458b5a4f03 Combine tar and isolate, so that everything is done in one definition. 2012-02-05 16:59:40 -08:00
Chad Weider
ddc74cd0f1 Make the comment a part of the module. 2012-02-05 16:59:40 -08:00
Chad Weider
ebb5055ce8 Extract file retrieval. 2012-02-05 16:59:40 -08:00
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, which caused jQuery's version to mismatch and installDeps to download a new version every run.
 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