mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-09 00:15:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
1107 commits 217 branches 107 tags 79 MiB
Commit graph

566 commits

Author SHA1 Message Date
Jean-Tiare Le Bigot
d95f08536b big CSS improvement in the dropdown of the editbar + fixed a bug in the header DOM generation that caused breakage in the authorship highlighting code 2012-03-02 22:20:56 +01:00
Jean-Tiare Le Bigot
457f9f913d attempt to fix to vertical sync issue 2012-03-02 21:02:26 +01:00
Jean-Tiare Le Bigot
666bdcaaf8 fixed style disapearing when adding a char + added a comment to describe the trick in contentcollector 2012-03-02 19:41:55 +01:00
Jean-Tiare Le Bigot
edc9212ff1 line after a title should be of normal type 2012-03-02 18:29:15 +01:00
Jean-Tiare Le Bigot
349b73977b CSS adaptations + added 'normal' style in dropdown 2012-03-02 16:57:37 +01:00
Jean-Tiare Le Bigot
332c6de873 removed alert 2012-03-02 14:48:20 +01:00
Jean-Tiare Le Bigot
9a5ae726bc quick and dirty title support implementation 2012-03-02 14:40:46 +01:00
Jean-Tiare Le Bigot
1d8dd16a21 fixed typos... 2012-03-01 20:56:22 +01:00
Jean-Tiare Le Bigot
9f70e729e0 added comments in ace2_inner.js + started title support based on the list code to reduce code duplication. 2012-03-01 19:01:15 +01:00
Jean-Tiare Le Bigot
26e5caa600 Merge remote-tracking branch 'remotes/upstream/master' into titles 2012-02-29 21:45:27 +01:00
Jean-Tiare Le Bigot
90d2edb2e7 first tentative of adding a field 2012-02-29 21:45:18 +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
0ip
43e90c7470 cross-browser compatible solution + removed some resizing stuff 2012-02-29 13:17:35 +01:00
0ip
cefda46a44 fixes #520, sideeffect: looks bad now using Chrome 2012-02-29 12:54:44 +01:00
0ip
b507f48a34 typos 2012-02-28 21:37:10 +01:00
0ip
5db8c5bda9 properly display number of users when more than 99 are on a pad + added ids + aligned chatlabel 2012-02-28 21:21:59 +01:00
0ip
a17a04182a fix weird looking input [IE7] 2012-02-27 22:40:47 +01:00
0ip
d8a0584768 more subtle ui feedback when pressing buttons 2012-02-27 22:29:21 +01:00
0ip
eddbc950dd combined css class 2012-02-27 22:06:46 +01:00
0ip
5bfde917b0 revert viewport to fix #508 2012-02-27 22:04:03 +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
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 '64f04670ef' into cleanup-ace-fix 
Conflicts:
	static/js/ace2_inner.js
 2012-02-24 20:22:32 +01:00