Peter 'Pita' Martischka
|
89adffed74
|
Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite
|
2011-04-07 20:04:52 +01:00 |
|
HansPinckaers
|
d53f155c56
|
removed logging
|
2011-04-07 20:59:18 +02:00 |
|
HansPinckaers
|
0b8b380d2b
|
userlist/embed working again
|
2011-04-07 20:45:28 +02:00 |
|
Lukas Martini
|
debbced185
|
Fixing scripts to run from both bin/ and /.
|
2011-04-07 19:54:41 +02:00 |
|
Lukas Martini
|
de967c1cd5
|
Revert "Adding Makefile for easier execution"
This reverts commit fed33e76fa.
|
2011-04-07 19:51:18 +02:00 |
|
Lukas Martini
|
81e13700ed
|
Merge branch 'master' of github.com:lutoma/etherpad-lite
|
2011-04-07 19:43:19 +02:00 |
|
Peter 'Pita' Martischka
|
204e89cd70
|
Add a comment to the readme that encourage to compile node.js from source
|
2011-04-07 18:51:57 +01:00 |
|
Lukas Martini
|
fed33e76fa
|
Adding Makefile for easier execution
|
2011-04-07 19:42:50 +02:00 |
|
HansPinckaers
|
540156735c
|
forgot italic-button
|
2011-04-07 18:09:13 +02:00 |
|
HansPinckaers
|
d828eeefa0
|
small redesign. refactored html/css, broke things, but looks a lot better.
|
2011-04-07 17:56:33 +02:00 |
|
Peter 'Pita' Martischka
|
a15f3426d4
|
beautify readme
|
2011-04-07 15:17:40 +01:00 |
|
Peter 'Pita' Martischka
|
4b99fec6ae
|
Improve run.sh
|
2011-04-07 14:51:46 +01:00 |
|
Peter 'Pita' Martischka
|
e2ce9dcc02
|
reorganize Joes PDF's
|
2011-04-07 14:45:19 +01:00 |
|
Peter 'Pita' Martischka
|
a8b91b9b40
|
improve the README
|
2011-04-07 14:35:13 +01:00 |
|
HansPinckaers
|
effc043025
|
Every browser working again, but FF has scrollbar
|
2011-04-07 15:16:38 +02:00 |
|
HansPinckaers
|
8bb02f4074
|
trying to fix ie
|
2011-04-07 14:07:53 +02:00 |
|
HansPinckaers
|
cb5b818f33
|
editor now always showing up on internet explorer 6
|
2011-04-07 13:41:07 +02:00 |
|
Peter 'Pita' Martischka
|
2d0dc5aab6
|
Improve the Error Messages
|
2011-04-06 22:53:07 +01:00 |
|
HansPinckaers
|
45cccef3e7
|
fixed connection=null error
|
2011-04-06 22:59:57 +02:00 |
|
HansPinckaers
|
5dc72234ab
|
fixed html (with whitespace realigned), color choosing is now working. Still needs work.
|
2011-04-06 22:36:20 +02:00 |
|
HansPinckaers
|
9eb1fecfa7
|
Merge remote branch 'johns/master'
|
2011-04-06 19:31:23 +02:00 |
|
Peter 'Pita' Martischka
|
255a1b94f2
|
Don't add a anonymous author to the attribute pool, this prevents some wired bugs
|
2011-03-28 23:08:25 +01:00 |
|
Peter 'Pita' Martischka
|
92257cd0af
|
Add a USER_LEAVE message
|
2011-03-28 23:07:35 +01:00 |
|
Peter 'Pita' Martischka
|
7d3c7bec15
|
Removed docs.html, was only for testing
|
2011-03-28 20:13:03 +01:00 |
|
Peter 'Pita' Martischka
|
82e7fda80e
|
Fixed the AttributePool Bug
|
2011-03-28 14:15:00 +01:00 |
|
Peter 'Pita' Martischka
|
b7c58a5e09
|
Added client side logging on handshake
|
2011-03-28 14:12:33 +01:00 |
|
Peter 'Pita' Martischka
|
31952532c2
|
Uploaded improved documentation about easysync, thx @Joe Corneli
|
2011-03-28 13:30:42 +01:00 |
|
Peter 'Pita' Martischka
|
7f851b6376
|
Add a runDebug Script
|
2011-03-28 13:27:09 +01:00 |
|
Peter 'Pita' Martischka
|
328e7f1aa4
|
Let the Server Handle USERINFO_UPATE correctly
|
2011-03-27 13:13:46 +01:00 |
|
Peter 'Pita' Martischka
|
9360814242
|
Created a JSDoc, first try
|
2011-03-27 12:49:56 +01:00 |
|
Peter 'Pita' Martischka
|
f28a5c18c6
|
Some improvements on message handling, on client and serverside
|
2011-03-27 12:49:04 +01:00 |
|
John McLear
|
9a6fe31419
|
Removed trailing , that broke IE7
|
2011-03-27 10:46:45 +00:00 |
|
John McLear
|
9e70313c0d
|
Added simple Json.js to support old versions of IE
|
2011-03-27 10:28:55 +00:00 |
|
John McLear
|
c9ab5aae19
|
Remove overlay2.png as it contained HTML
|
2011-03-27 10:13:22 +00:00 |
|
John McLear
|
51798f3862
|
Removed docbarstates.png as it included HTML
|
2011-03-27 10:08:08 +00:00 |
|
John McLear
|
78d8e18634
|
Remove overlay.png as it included HTML
|
2011-03-27 10:06:16 +00:00 |
|
Peter 'Pita' Martischka
|
c563faf431
|
Add Comments to Message Handler
|
2011-03-26 21:29:33 +00:00 |
|
John McLear
|
750c75e1dc
|
Fix bug where it displayed users when showing embed div
|
2011-03-26 19:57:17 +00:00 |
|
John McLear
|
b26b1ebf15
|
Fix iFrame issue where console is set to top. and change to window.
|
2011-03-26 19:47:31 +00:00 |
|
John McLear
|
82f427422a
|
Updated welcome to text to read something more friendly and useful
|
2011-03-26 18:48:38 +00:00 |
|
John McLear
|
3b029b638d
|
more css for users stuff
|
2011-03-26 18:45:35 +00:00 |
|
John McLear
|
5558e23107
|
Commented out pad_chat.js
|
2011-03-26 18:44:30 +00:00 |
|
John McLear
|
843a45f120
|
yet another readme update
|
2011-03-26 17:50:23 +00:00 |
|
John McLear
|
fc4ef5b430
|
Nice looking user demo css
|
2011-03-26 17:42:36 +00:00 |
|
John McLear
|
5050491018
|
nice looking user demo
|
2011-03-26 17:42:19 +00:00 |
|
John McLear
|
2c8a5987e4
|
Removed some uservoice and feedback chuf
|
2011-03-26 17:41:56 +00:00 |
|
John McLear
|
c66bce6461
|
Remove old css for displaying users and chat and add new css for new view
|
2011-03-26 17:17:13 +00:00 |
|
John McLear
|
86eea91c22
|
Beginning of Users view
|
2011-03-26 17:16:43 +00:00 |
|
John McLear
|
5170c29e18
|
Fix css href
|
2011-03-26 17:16:19 +00:00 |
|
John McLear
|
1afc41d606
|
Fix minor css bug in embed part 2
|
2011-03-26 16:04:07 +00:00 |
|