Peter 'Pita' Martischka
|
9cc3b543cc
|
Merge branch 'master' of git://github.com/Pita/etherpad-lite into api
|
2011-08-10 22:47:50 +01:00 |
|
Peter 'Pita' Martischka
|
ce1012438e
|
added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected
|
2011-08-10 22:44:16 +01:00 |
|
Peter 'Pita' Martischka
|
dc15682a27
|
changed name of getMapped*4 functions to create*IfNotExistsFor
|
2011-08-10 22:43:38 +01:00 |
|
Peter 'Pita' Martischka
|
578f8db311
|
improved test.html
|
2011-08-10 22:43:29 +01:00 |
Randy
|
9f530962ee
|
Add js tests to assist with api development
|
2011-08-10 22:43:20 +01:00 |
|
Peter 'Pita' Martischka
|
3c46cce341
|
some small design changes
|
2011-08-10 18:26:12 +01:00 |
|
Peter 'Pita' Martischka
|
13c10013b9
|
do the chat resize without hiding the pad text
|
2011-08-10 18:18:50 +01:00 |
|
Peter 'Pita' Martischka
|
d812557445
|
fixed #73
|
2011-08-10 18:06:22 +01:00 |
|
Peter 'Pita' Martischka
|
33ec98dd35
|
beauty
|
2011-08-10 17:24:59 +01:00 |
|
Peter 'Pita' Martischka
|
c4ac1babe8
|
removed unused images
|
2011-08-10 17:23:38 +01:00 |
|
Peter 'Pita' Martischka
|
ba9861382e
|
fixed the design
|
2011-08-10 17:19:23 +01:00 |
|
Peter 'Pita' Martischka
|
d66675914c
|
Merge branch 'newDesignTest' of /home/jose/etherpad-lite.io/ into johnslayout
|
2011-08-10 16:19:02 +01:00 |
|
Peter 'Pita' Martischka
|
1a824bd130
|
Merge branch 'master' of .git into api
|
2011-08-09 11:08:27 +01:00 |
|
Peter 'Pita' Martischka
|
178b4a95ec
|
added getMappedGroup4 and createGroup
|
2011-08-08 16:21:31 +01:00 |
Robin Buse
|
15bf4b9313
|
Edited static/index.html via GitHub
|
2011-08-02 15:06:09 +03:00 |
|
Robin Buse
|
17472a7270
|
Removed unnecessary comments, changed label class to id and moved the custom js to the appropriate place
|
2011-08-02 14:56:55 +03:00 |
John McLear
|
143369b387
|
Merge branch 'master' of git://github.com/Pita/etherpad-lite into newDesignTest
|
2011-08-01 23:13:51 +01:00 |
|
John McLear
|
ab2c8fadf1
|
Fix button alignment issues making the butotns prettier after I made them 1px out in places
|
2011-08-01 20:01:41 +01:00 |
|
John McLear
|
9911fb95b9
|
fixed merge confilcts in pad.html
|
2011-08-01 13:20:05 +01:00 |
|
Peter 'Pita' Martischka
|
053e48c3f4
|
Secure the call of the costumStart function
Author: Peter 'Pita' Martischka <petermartischka@googlemail.com>
|
2011-08-01 12:09:33 +01:00 |
|
John McLear
|
03192c1b9a
|
Fix the styling of the chat vdraggie
|
2011-07-31 20:16:59 +01:00 |
|
John McLear
|
4d4773c1f3
|
Fix CSS and HTML bugs with new sprites
|
2011-07-31 20:07:18 +01:00 |
|
John McLear
|
1d62de9acf
|
Updated CSS for sprites
|
2011-07-31 19:41:54 +01:00 |
|
John McLear
|
92377613d7
|
First version of working sprites -- Still some work to do such as changing export icons to use the latest .gif but this is good start
|
2011-07-31 19:41:42 +01:00 |
|
Peter 'Pita' Martischka
|
8101b7df92
|
Changed the gitignore so everything exept the template files are ignored
|
2011-07-31 19:39:14 +01:00 |
|
Peter 'Pita' Martischka
|
c8d89e9147
|
added some forgotten ids
|
2011-07-31 19:32:35 +01:00 |
|
John McLear
|
d4ffbdcc1c
|
Add a new class for buttonicon which specifies the new backghround image, this is part of the single image thing Peter wants to reduce the number of images we need
|
2011-07-31 19:11:55 +01:00 |
|
John McLear
|
7b69f3d7ed
|
New icons file, updated timeslider and resize image
|
2011-07-31 19:08:14 +01:00 |
|
John McLear
|
3a4c0ea254
|
Remvoed maximize button -- I never liked this..
|
2011-07-31 18:53:03 +01:00 |
|
John McLear
|
20bb067743
|
removed old background image
|
2011-07-31 18:52:35 +01:00 |
|
John McLear
|
16c9bf6130
|
removed old pad top image that is no logner used
|
2011-07-31 18:52:17 +01:00 |
|
Peter 'Pita' Martischka
|
de32503f8e
|
improve including of custom js/css
|
2011-07-31 17:21:01 +01:00 |
|
Peter 'Pita' Martischka
|
bcaadfa6eb
|
Ensure the browser doesn't send socket.io message with the browser version
|
2011-07-31 16:13:56 +01:00 |
|
Peter 'Pita' Martischka
|
aa5b1b85ae
|
fixed all random string functions
|
2011-07-31 11:48:06 +01:00 |
|
Robin Buse
|
64b4ff3fb1
|
poor Y and j... :)
|
2011-07-31 01:58:46 +03:00 |
|
Peter 'Pita' Martischka
|
a47b5ab458
|
added the ability to add costum js/css
|
2011-07-30 16:33:35 +01:00 |
|
Peter 'Pita' Martischka
|
115f7d6b51
|
Fixed the iframe problems
|
2011-07-27 15:11:30 +01:00 |
|
Peter 'Pita' Martischka
|
e96595896c
|
Fixed wordle export under https
|
2011-07-27 13:35:22 +01:00 |
|
Peter 'Pita' Martischka
|
6867d881b1
|
Hide import/export options that are not avaiable if abiword isn't configured
|
2011-07-26 18:54:42 +01:00 |
|
Peter 'Pita' Martischka
|
0d46d6f050
|
Merge git://github.com/0ip/etherpad-lite into newDesignTest
|
2011-07-26 18:15:18 +01:00 |
|
Robin Buse
|
1e54c41f60
|
Edited static/index.html via GitHub
|
2011-07-26 20:14:01 +03:00 |
|
Peter 'Pita' Martischka
|
87d24238a8
|
Merge git://github.com/0ip/etherpad-lite into newDesignTest
|
2011-07-26 18:10:38 +01:00 |
|
Peter 'Pita' Martischka
|
6e2f3a5f7f
|
Merge /home/jose/etherpad-lite.io/ into newDesignTest
|
2011-07-26 18:08:43 +01:00 |
|
Peter 'Pita' Martischka
|
1a43731a06
|
Ops, looks like I broke the wordle export at some point, now I fixed it
|
2011-07-26 18:02:23 +01:00 |
|
Peter 'Pita' Martischka
|
56ab112fa3
|
Timeslider Javascript is now minified too
|
2011-07-26 17:39:25 +01:00 |
root
|
3c493b2f50
|
Fix for IE erroring on chat window close
|
2011-07-26 17:35:00 +01:00 |
|
Robin Buse
|
b987a23cd0
|
Edited static/index.html via GitHub
|
2011-07-26 19:32:41 +03:00 |
|
Peter 'Pita' Martischka
|
00824ae2d7
|
Ops, fixed a small bug at the timeslider
|
2011-07-26 16:46:28 +01:00 |
|
Peter 'Pita' Martischka
|
b43c7e7c99
|
ensure non url chars are not used for pad names or pad links
|
2011-07-26 16:17:02 +01:00 |
|
Robin Buse
|
01483406ee
|
pass w3c validator
|
2011-07-26 18:11:51 +03:00 |