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

520 commits

Author SHA1 Message Date
John McLear
a449876f80 Merge pull request #498 from eldiddio/master 
This fixes issue #308
 2012-02-25 09:32:55 -08:00
Mark Fisher
164db7b074 Added test for IE XML HTTP and added link to wiki article 2012-02-25 17:30:59 +00:00
0ip
9790598381 fix for #491 + #415a (floating chat icon) & fixed hidden authorship colors button on iOS 2012-02-25 16:41:10 +01:00
John McLear
e9858041a4 Merge pull request #494 from 0ip/miscFix 
Misc fix
 2012-02-25 05:32:29 -08:00
John McLear
1b5a7659c3 fix bug #495 2012-02-25 13:28:47 +00:00
Matthias Bartelmeß
0191c248b5 Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix 
Conflicts:
	static/js/ace2_inner.js
 2012-02-24 20:22:32 +01:00
John McLear
64f04670ef Merge pull request #483 from fourplusone/ace2_inner_patch2 
refactored ace_setProperty of ace2_inner.js
 2012-02-24 09:00:18 -08:00
John McLear
04126690fb Merge pull request #480 from fourplusone/ace2_inner_patch-1 
fixed indention + variable scoping
 2012-02-24 08:52:41 -08:00
John McLear
88744901c0 Fixes import major bug caused by removing container required for callback of import 2012-02-24 12:23:31 +00:00
Matthias Bartelmeß
b06f3f6903 removed ";" 2012-02-21 23:15:19 +01:00
Matthias Bartelmeß
4ef71c3534 documented ace_setProperty 2012-02-21 23:13:59 +01:00
Matthias Bartelmeß
eae87fd835 fixed indention + variable scoping 2012-02-21 21:46:25 +01:00
drdla
ec2d415a92 Promote proper use of css specificity 2012-02-20 22:28:25 +01:00
John McLear
d479784559 Hotfix for issue #467 https://github.com/Pita/etherpad-lite/issues/467 -- probably wants a permafix 2012-02-20 01:11:34 +00:00
Matthias Bartelmeß
b9130134c6 remove javascript lexer styles 2012-02-19 21:59:31 +01:00
0ip
0261ab653e Update static/css/pad.css 2012-02-19 20:10:10 +01:00
0ip
fc0114fc2d added settings to mobile version 2012-02-19 17:51:10 +01:00
0ip
12298a926c move width-specific css to bottom + transfer js-css to a class [#chatbox:.stickyChat] 2012-02-19 17:16:05 +01:00
0ip
255cf8c5f0 qr codes now have equal margins 2012-02-19 17:04:36 +01:00
0ip
a540bff652 more robust index page + fix for iOS Safari rotation-bug 2012-02-19 17:00:43 +01:00
Matthias Bartelmeß
f9ad9bec92 clean up broadcast.js 2012-02-19 16:05:07 +01:00
Matthias Bartelmeß
465f6c2de7 use shared functions from Ace2Common 2012-02-19 15:47:20 +01:00
Matthias Bartelmeß
9ede14a546 drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller 2012-02-19 15:02:54 +01:00
Matthias Bartelmeß
7e7646b517 make jshint a bit more happier 2012-02-19 14:52:24 +01:00
Matthias Bartelmeß
ce8d60e32c remamed to Ace2Inner() and made it more classlike 2012-02-19 14:30:57 +01:00
Matthias Bartelmeß
3c4b4af43d removed recolor module since it wasn't used 2012-02-19 14:30:08 +01:00
Matthias Bartelmeß
fb879576e1 replaced noop in skiplist with ace2common implementation 2012-02-19 14:28:51 +01:00
Matthias Bartelmeß
5d14fb372a Merge branch 'cleanup-ace-js' into cleanup-ace 2012-02-19 14:19:54 +01:00
Matthias Bartelmeß
5313053d2d even more compact code for exposed functions in ace2.js 2012-02-19 14:18:52 +01:00
Matthias Bartelmeß
a66e01a08f moving noop and identity helper functions to ace2_common 2012-02-19 14:11:32 +01:00
Matthias Bartelmeß
77dbe4646e binarySearch is never used 2012-02-19 12:40:13 +01:00
Matthias Bartelmeß
3cd7bd0dd1 Since ace2_inner.js is already scoped by require-kernel, function OUTER is pretty useless 2012-02-19 12:34:24 +01:00
Matthias Bartelmeß
99fb567a3d removed parenModule as it is entirely unused since getCharType() always returns an emtpy string 2012-02-19 12:15:42 +01:00
Matthias Bartelmeß
8031c31bc3 more compact code for exposed functions in ace2.js 2012-02-19 03:16:42 +01:00
John McLear
6ba865521a See 1caaff9308 
https://github.com/Pita/etherpad-lite/pull/462
 2012-02-18 17:51:39 +00:00
drdla
f93fba2511 Improved file structure and CSS coding style; also ran CSSLint on it; 
To be done: sprite and compress images
 2012-02-14 23:49:43 +01:00
Peter 'Pita' Martischka
5751a8e434 Merge pull request #352 from cweider/modulize-share 
Module Sharing
 2012-02-14 09:21:45 -08:00
Jordan
da23a62c49 Remove an unused collab client message 2012-02-13 22:59:12 -05:00
Jordan
0d3188365a Bugfix to noColors view option 2012-02-13 22:59:12 -05:00
Chad Weider
e0d23e3c5d Create and use the Security module. 
Use it to replace code on the client and server side.
 2012-02-10 14:52:35 -08:00
Chad Weider
363e168561 Share randomString method. 
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
 2012-02-10 14:52:34 -08:00
Chad Weider
34edba3adf Share createCookie and readCookie methods. 2012-02-10 14:52:34 -08:00
Chad Weider
7038f9a61d Drop the cssmanager_client module. 2012-02-10 14:52:34 -08:00
Chad Weider
f6ac0b1926 Drop the linestylefilter_client module. 2012-02-10 14:52:34 -08:00
Chad Weider
3581a45491 Drop the domline_client module. 2012-02-10 14:52:34 -08:00
Chad Weider
4098cbe03b Drop the easysync* modules. 2012-02-10 14:52:34 -08:00
Chad Weider
f8f80968ca Share the AttributePoolFactory, Changeset, and contentcollector modules. 2012-02-10 14:52:34 -08: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