Commit graph

7442 commits

Author SHA1 Message Date
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
2e163f2924 reorganzied the bin folder 2011-07-26 17:00:56 +01:00
Peter 'Pita' Martischka
00824ae2d7 Ops, fixed a small bug at the timeslider 2011-07-26 16:46:28 +01:00
Peter 'Pita' Martischka
f67006224f updated dependencies 2011-07-26 16:45:39 +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
Robin Buse
e56ef9c26e Yeah, it was late... 2011-07-26 16:45:24 +03:00
Robin Buse
e493516ecd removed animation 2011-07-26 16:40:59 +03:00
Robin Buse
705e83c410 reduced animation effects 2011-07-26 16:36:12 +03:00
Robin Buse
a6dcc073b0 Edited static/index.html via GitHub 2011-07-26 16:19:29 +03:00
Robin Buse
2e6c99befd Edited static/index.html via GitHub 2011-07-26 16:19:01 +03:00
Robin Buse
f755b4d916 Edited static/index.html via GitHub 2011-07-26 16:17:45 +03:00
Robin Buse
08aa416eb6 Edited static/index.html via GitHub 2011-07-26 16:13:26 +03:00
Robin Buse
88bac4d572 Edited static/index.html via GitHub 2011-07-26 16:11:39 +03:00
Robin Buse
4bcc415aea Edited static/index.html via GitHub 2011-07-26 15:07:23 +03:00
Robin Buse
3a64ee733b Cleanup 2011-07-25 17:09:24 -07:00
Robin Buse
2bd2348cc0 Removed outdated backslashes and strange newlines within elements 2011-07-25 16:47:25 -07:00
Robin Buse
6eb0080ac5 Forgot a newline... 2011-07-25 16:42:27 -07:00
Robin Buse
a8e676ea7c HTML5 Exporter Upgrade 2011-07-25 16:29:32 -07:00
Robin
d3e7906951 Removed dummy pad name and revision date 2011-07-25 16:16:00 -07:00
Robin
6823c13001 Fixed import animations 2011-07-25 16:07:34 -07:00
Robin
d1d8ab9e35 Edited static/pad.html via GitHub 2011-07-25 15:45:49 -07:00
Robin
d73d806022 1) Label color a bit darker than before 2) New smooth animation 3) Bugfix: form can be submitted within the text input instead of clicking the button 4) Added future gradients for Opera 2011-07-25 15:45:04 -07:00
Robin
9b89816178 typo... 2011-07-25 15:41:14 -07:00
Peter 'Pita' Martischka
eb40c014b6 Fixed the NaN Bug on timeslider 2011-07-25 17:26:56 +01:00
Peter 'Pita' Martischka
1067d17381 Log the disconnect diagnostic info that etherpad still sends. Maybe thats usefull 2011-07-25 16:31:41 +01:00
Peter 'Pita' Martischka
e9a389b0a6 improved minifying 2011-07-25 14:38:54 +01:00
Peter 'Pita' Martischka
ba677c6e30 Fixed merge conflicts + changed the design of the front page a bit 2011-07-25 12:35:38 +01:00
Robin
81f261935d ie10 button:active fix + removed useless transition 2011-07-25 03:37:09 -07:00
Robin
dcd6d4cc09 Removed branding, sorry 2011-07-24 13:54:49 -07:00
Peter 'Pita' Martischka
fa607e5af8 Ops, forgot renaming pad.css in timeslider.html 2011-07-24 21:41:42 +01:00
Peter 'Pita' Martischka
a9673765ae Merge branch 'newmaster' of ../etherpad-lite.io2 2011-07-24 21:30:22 +01:00
Peter 'Pita' Martischka
08d835187c now, we're able to import code files 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
358046fd5b Improve handling of abiword errors 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
8138c7d15e rename pad_lite.css to pad.css, its just a better name 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
646d300b24 removed blue lines from export links 2011-07-24 21:26:43 +01:00
Robin
90ac1e190d Edited static/index.html via GitHub 2011-07-24 21:26:43 +01:00
Peter 'Pita' Martischka
1c8f70fae9 Disabling minify creates now one big js file, instead of loading js files dynamicly. This solves problems we had with random loading of the js files 2011-07-24 21:26:43 +01:00
Robin
c5d3626d72 typo fix 2011-07-24 10:39:25 -07:00
Robin
fe93a7a9d8 + removed IE7 css link since it doesn't exist anymore
+ some cleanup
2011-07-24 10:34:33 -07:00
Robin
d7270d63d6 Revive the good old pointer... 2011-07-24 10:30:52 -07:00
Peter 'Pita' Martischka
6daa23b30e Merge pull request #35 from 0ip/patch-1
Edited static/index.html via GitHub
2011-07-24 09:48:04 -07:00
Robin
a6b18ff64a Edited static/index.html via GitHub 2011-07-24 09:47:04 -07:00
Robin
124f076656 Edited static/timeslider.html via GitHub 2011-07-24 09:34:38 -07:00
Robin
e8f8f51850 Edited static/timeslider.html via GitHub 2011-07-24 09:33:46 -07:00