libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 14:39:53 +01:00
Code Issues Projects Releases Wiki Activity
1025 commits 206 branches 105 tags 123 MiB
Commit graph

532 commits

Author SHA1 Message Date
John McLear
21246711c1 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-26 15:13:01 +00:00
John McLear
aa78456ab9 Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller" 
This reverts commit 9ede14a546.
 2012-02-26 14:49:13 +00:00
Peter 'Pita' Martischka
9709589f87 Merge pull request #505 from jucovschi/changeset_docs 
Documented Changeset.js to the best of my knowledge
 2012-02-26 05:13:27 -08:00
John McLear
8d764cad33 Perma fix for issue #485 and #327 2012-02-26 13:07:09 +00:00
Constantin Jucovschi
e318e3d4cb some new docs 2012-02-26 12:59:20 +00:00
Constantin Jucovschi
ac86535cdf more docs 2012-02-26 12:59:11 +00:00
Constantin Jucovschi
3abdd34160 writing in jsdoc syntax 2012-02-26 12:59:02 +00:00
Constantin Jucovschi
1e8ef3bb6a commented general functions 2012-02-26 12:58:57 +00:00
John McLear
681e8415b6 Fix issue #485 2012-02-26 12:38:52 +00:00
John McLear
44ec2e148a Merge pull request #502 from drdla/master 
Suggestion for new favicon
 2012-02-25 14:40:35 -08:00
Dominik Rodler
4e54ebb0b8 Added new favicon 2012-02-25 20:45:28 +01:00
John McLear
2fd1702960 fix sticky chat... dont like where i put the call but it will have to do cause im tired. 2012-02-25 19:35:49 +00:00
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