Commit graph

112 commits

Author SHA1 Message Date
John McLear
30da7357e5 Merge pull request #326 from 0ip/fileinputfix
Fixed file input readability in Chrome
2012-01-14 07:24:34 -08:00
Robin
42eee71295 Fixed file input readability in Chrome 2012-01-14 15:07:11 +01:00
Robin
8787897f60 Changed position values 2012-01-13 23:58:47 +01:00
John McLear
86902c2c0b Merge pull request #291 from jhollinger/export_revisions
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
0ip
9203ac2362 (1) Support for x*720px phones (like Galaxy Nexus) (2) Fix for user popup 2011-12-31 18:16:50 +01:00
0ip
2481c1cb4f removed hackish code 2011-12-31 17:47:34 +01:00
Jordan
2a86d57e46 Add ability to export specific pad revisions 2011-12-18 00:18:35 -05:00
John McLear
d20dcc7c57 fixed merge conflicts 2011-12-11 18:45:41 +01:00
Peter 'Pita' Martischka
3401a7bc11 small css fix at the importexport panel 2011-12-11 18:20:05 +01:00
Peter 'Pita' Martischka
c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki 2011-12-11 18:09:51 +01:00
Adrian Lang
40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
0ip
a4dad594d3 Optimized css for mobile devices 2011-12-06 18:46:40 +01:00
0ip
1cf52682df 💅 Small fix for a recently introduced alignment-bug (10px are missing) + fixed gap between the checkbox and 'Read Only' @ Share and Embed dropdown 2011-12-02 22:47:29 +01:00
0ip
495b48056b Minor bugfix: Solves http://j.mp/utOjbn 2011-12-02 20:36:02 +01:00
John McLear
9e509677dc Merge pull request #231 from jtlebi/origin/shift-tab
(de)indent behaviour enhancement
2011-11-28 20:23:37 -08:00
John McLear
90d36471b1 Remove read only link and place all functionality into embed option sorts issue #246 2011-11-27 21:04:11 +00:00
Peter 'Pita' Martischka
dc6d0cda68 Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-25 16:08:24 -08:00
Peter 'Pita' Martischka
fa098d73cd Do a reconnect on network problems. After 10s it gives up 2011-11-25 15:26:01 -08:00
Jean-Tiare Le Bigot
ea2e7d0550 added support for (de)indent of regular text 2011-11-25 10:29:31 +01:00
Alexandre Girard
7a7b3391fb add checkbox to limit number of inputs 2011-11-24 16:34:28 +01:00
John McLear
ccaa21a04a Styling for the new embed options 2011-11-23 15:49:22 +00:00
John McLear
bf0fe9377d Input fix for Wikinaut 2011-11-06 12:06:16 +00:00
Robin Buse
fd97946619 fixed user drop down issue 2011-08-24 04:48:21 +03:00
Peter 'Pita' Martischka
913c3c455d fixed merge conflicts 2011-08-22 13:14:59 +01:00
Peter 'Pita' Martischka
8c301d4fe8 remove star buttons on timeslider 2011-08-21 20:09:09 +01:00
Peter 'Pita' Martischka
6c354c6333 improved the design of the user icon 2011-08-21 18:18:35 +01:00
Robin Buse
82e4d7fe7d Edited static/css/pad.css via GitHub 2011-08-21 09:45:05 +03:00
Peter 'Pita' Martischka
42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-20 18:23:58 +01:00
Peter 'Pita' Martischka
9d37d91ce1 added a colorPicker 2011-08-20 18:22:10 +01:00
Peter 'Pita' Martischka
b02ee510ac Merge branch 'patch-3' of https://github.com/0ip/etherpad-lite 2011-08-17 19:58:37 +01:00
Peter 'Pita' Martischka
c8a0f946f2 Merge branch 'patch-4' of https://github.com/0ip/etherpad-lite 2011-08-17 19:43:39 +01:00
Peter 'Pita' Martischka
84f1baf972 fixed a small css bug at the disconnect message 2011-08-17 18:11:36 +01:00
Robin Buse
58ea0d0ed3 changed .gif to .png 2011-08-17 19:14:43 +03:00
Robin Buse
d4b713d236 colorized the return link and removed some odd stuff 2011-08-16 23:49:52 +03:00
Robin Buse
ac0dff0c2c height @ #editbar ul is redundant && removed some space 2011-08-16 23:44:43 +03:00
Robin Buse
6f7a9ce77a Redesigned pad editbar + chatbox (bg color) 2011-08-16 23:40:07 +03:00
John McLear
5d30c8b4a5 Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue 2011-08-16 21:29:51 +01:00
Peter 'Pita' Martischka
d2c502e2be added deletePad API function 2011-08-16 20:02:30 +01:00
John McLear
37224f620f Fix issue 82, bullets not showing up in time slider, please note that the timeslider may have other css bugs such as indent etc and this needs testing 2011-08-15 15:48:49 +01:00
John McLear
4b77dd8c7a Beginning of a show chat history function 2011-08-13 21:59:12 +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
33ec98dd35 beauty 2011-08-10 17:24:59 +01:00
Peter 'Pita' Martischka
ba9861382e fixed the design 2011-08-10 17:19:23 +01:00
John McLear
03192c1b9a Fix the styling of the chat vdraggie 2011-07-31 20:16:59 +01:00
John McLear
1d62de9acf Updated CSS for sprites 2011-07-31 19:41:54 +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
Peter 'Pita' Martischka
ba677c6e30 Fixed merge conflicts + changed the design of the front page a bit 2011-07-25 12:35:38 +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