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 |
|
Robin
|
83f790af1c
|
Edited static/pad.html via GitHub
|
2011-07-24 09:33:16 -07:00 |
|
Robin
|
520da9d521
|
Edited static/timeslider.html via GitHub
|
2011-07-24 09:32:32 -07:00 |
|
Robin
|
3eec9a935d
|
Edited static/pad.html via GitHub
|
2011-07-24 09:31:39 -07:00 |
|
Robin
|
e0b60acaef
|
Edited static/pad.html via GitHub
|
2011-07-24 09:31:01 -07:00 |
|
Robin
|
8fc178d987
|
Edited static/index.html via GitHub
|
2011-07-24 09:28:45 -07:00 |
|
Peter 'Pita' Martischka
|
3ccdcec7e8
|
ensure we don't send a handshake on every reconnect
|
2011-07-22 14:17:58 +01:00 |
|
Peter 'Pita' Martischka
|
a717e07531
|
Moved John's code to the correct place
|
2011-07-22 14:07:13 +01:00 |
|
Peter 'Pita' Martischka
|
73f97cc7d5
|
removed the tests folder, we never did tests anyway
|
2011-07-22 13:45:12 +01:00 |
|
Peter 'Pita' Martischka
|
b13fbbfd73
|
Import works now on the server side
|
2011-07-21 20:13:58 +01:00 |
|
John McLear
|
4b268f9579
|
Make a pulsating chat notification and remove the throb from the tab
|
2011-07-20 21:50:58 +01:00 |
|
John McLear
|
fba2c5ccb2
|
Hide the import/export by default
|
2011-07-20 17:33:40 +01:00 |
|
John McLear
|
2920c35c0f
|
Now import/Export works
|
2011-07-20 17:33:27 +01:00 |
|
John McLear
|
1fca334704
|
fix literal paths, now they are relative
|
2011-07-20 17:26:50 +01:00 |
|
John McLear
|
43508a32a3
|
Ensure the last chat comment is always in focus after resize
|
2011-07-20 17:23:01 +01:00 |
|
John McLear
|
126dc4d0e8
|
Ensure cursor types are right for all icons and objects
|
2011-07-20 17:20:46 +01:00 |
|
John McLear
|
4f06d4688f
|
Add wordle support, temporary, Pita to move
|
2011-07-20 16:38:03 +01:00 |
|
John McLear
|
802866a5da
|
Open link in new window file
|
2011-07-20 16:01:26 +01:00 |
|
John McLear
|
1849adf9b8
|
Import CSS and open export in new window
|
2011-07-20 16:01:10 +01:00 |
|
John McLear
|
77dc7ede14
|
change end points to right export endpoint
|
2011-07-20 15:48:24 +01:00 |
|
John McLear
|
d8e39e82d1
|
Merge branch 'master' of git://github.com/Pita/etherpad-lite
|
2011-07-20 15:44:36 +01:00 |
|
John McLear
|
184239879f
|
Add fileicons which is the export icosn
|
2011-07-20 15:43:55 +01:00 |
|
John McLear
|
50c6b9de00
|
Temporary code that brings in some export support
|
2011-07-20 15:42:47 +01:00 |
|
John McLear
|
b4c2f6eb11
|
Updated doctype after I messed it up before, updated some css for import/export
|
2011-07-20 15:31:50 +01:00 |
|
John McLear
|
a6faf73cbb
|
Basics of import/export dialogue, requires hiding etc.
|
2011-07-19 22:08:26 +01:00 |
|
John McLear
|
0294c32c2a
|
Hand when hovering over chat and position of chat title bar fix
|
2011-07-19 21:42:21 +01:00 |
|
Peter 'Pita' Martischka
|
8b6be1b014
|
Merge branch 'master' of /home/jose/etherpad-lite/
|
2011-07-19 20:06:44 +01:00 |
|
John McLear
|
a07bd76625
|
Final major add for working buttons in IE
|
2011-07-19 20:04:36 +01:00 |
|
John McLear
|
cf255b2979
|
Make the pad calls work properly in IE
|
2011-07-19 20:04:30 +01:00 |
|
John McLear
|
e7b690c7fc
|
Make the chat work in IE
|
2011-07-19 20:04:24 +01:00 |
|
John McLear
|
322a66aab1
|
Change order of JS, hope to load utils early on, im not sure this is a proper fix though
|
2011-07-19 20:04:16 +01:00 |
|
John McLear
|
d9e18f38a3
|
Add resize image for chatbox
|
2011-07-19 20:04:10 +01:00 |
|