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

314 commits

Author SHA1 Message Date
Egil Moeller
ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
 2012-03-02 22:00:20 +01:00
Marcel Klehr
f5f82a7637 Rework dynamic text contrast 
-Remove hard coding of default text color
-add dynamic link text contrast
 2012-02-29 14:21:35 +01:00
Marcel Klehr
173e7c8f27 Extend colorutils 
Add color invertion and calculation of complementary colors.
 2012-02-29 14:16:20 +01:00
Peter 'Pita' Martischka
611cfbd6fa Merge pull request #468 from cweider/minify-simplify 
Minify Simplification
 2012-02-27 10:00:18 -08:00
Peter 'Pita' Martischka
bf42359669 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-27 17:34:11 +01:00
Peter 'Pita' Martischka
d00be5b817 Removed all window.unload event handlers. This kind of fixes #200 2012-02-27 17:33:27 +01:00
Stefan 'Gared
c54d47e1c6 Added cookie to save option showing author colors 2012-02-27 15:24:36 +00:00
Peter 'Pita' Martischka
da2b456b5b Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-27 00:23:14 +01:00
Peter 'Pita' Martischka
ed8aff22d4 restart abiword on crash and give the user feedback about bad import files 2012-02-27 00:22:53 +01:00
John McLear
4fc57921f0 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-26 21:27:06 +00:00
John McLear
4dc86f3382 fix #507 import showing when it shouldnt 2012-02-26 21:26:42 +00:00
John McLear
7d923277a6 Merge pull request #506 from jucovschi/changeset_docs 
more doc updates on Changeset.js
 2012-02-26 11:14:40 -08:00
Constantin Jucovschi
9fe4318e77 more doc update 2012-02-26 18:59:11 +00:00
Peter 'Pita' Martischka
c3f728b2ed 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 16:13:07 +01:00
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
Egil Moeller
1239ce7f28 The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +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
Mark Fisher
164db7b074 Added test for IE XML HTTP and added link to wiki article 2012-02-25 17:30:59 +00: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
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
Chad Weider
78691feec7 Drop all packaging logic from minify. 2012-02-19 20:47:23 -08:00
Chad Weider
dcc0740621 Use Yajsml to combine files. 
Minify only constructs individual files and optionally compresses them with UglifyJS.
 2012-02-19 20:43:17 -08: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
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
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