John McLear
|
c30d2fde96
|
Merge pull request #724 from fourplusone/fix/fix-722-develop
fix #722 in the develop branch
|
2012-05-22 05:31:25 -07:00 |
|
Matthias Bartelmeß
|
06c36f3023
|
fix #722 by better argument checking in PadMessageHandler.js
|
2012-05-22 09:31:28 +02:00 |
|
Matthias Bartelmeß
|
54511a6cea
|
fix #722 by better argument checking in PadMessageHandler.js
|
2012-05-22 09:27:08 +02:00 |
|
0ip
|
185a3bface
|
Add def. bg to <select> and remove useless style
|
2012-05-20 20:19:16 +03:00 |
|
johnyma22
|
28abd527bc
|
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
|
2012-05-20 17:54:12 +01:00 |
|
John McLear
|
a40475666c
|
Merge pull request #719 from 0ip/fix_css
Non-floating popups
|
2012-05-20 09:52:31 -07:00 |
|
0ip
|
fe0ea23299
|
Fix userlist now showing up
|
2012-05-20 16:02:51 +02:00 |
|
0ip
|
caa56dd32a
|
Add non-floating popups
|
2012-05-20 15:59:51 +02:00 |
|
0ip
|
19cf43d0a3
|
Style select (useful for plugins)
|
2012-05-20 15:38:12 +02:00 |
|
0ip
|
750b9d44df
|
Style selected text
|
2012-05-20 15:37:03 +02:00 |
|
0ip
|
205797cd83
|
Remove class duplicate
|
2012-05-20 15:35:41 +02:00 |
|
0ip
|
fbee7dabcf
|
Add grouped buttons
|
2012-05-20 15:29:10 +02:00 |
|
John McLear
|
f3845c4020
|
Merge pull request #718 from 0ip/remove_old_css
Remove old Etherpad CSS code
|
2012-05-20 05:57:42 -07:00 |
|
0ip
|
afe060e2b8
|
Remove even more old code
|
2012-05-20 14:53:30 +02:00 |
|
0ip
|
0d68cd23ba
|
Remove old CSS code
|
2012-05-20 14:48:02 +02:00 |
|
johnyma22
|
102540f51b
|
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
|
2012-05-19 13:58:48 +01:00 |
|
John McLear
|
fbc2cb32b3
|
Merge pull request #705 from johnyma22/removeWordle
Remove wordle
|
2012-05-19 05:58:38 -07:00 |
|
johnyma22
|
bd30045d44
|
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
|
2012-05-19 13:42:29 +01:00 |
|
John McLear
|
53bfc380af
|
Merge pull request #703 from cweider/remove-onclick
Remove onclick
|
2012-05-19 05:41:49 -07:00 |
|
John McLear
|
f3036eb124
|
Merge pull request #715 from redhog/master
Bugfix for IE and document.domain
|
2012-05-18 10:19:44 -07:00 |
|
Egil Moeller
|
9f46678e5d
|
Bugfix for IE and document.domain
|
2012-05-18 18:57:18 +02:00 |
|
John McLear
|
ee11338927
|
Merge pull request #709 from cweider/packaging
Packaging
|
2012-05-17 04:59:24 -07:00 |
|
John McLear
|
1043d607d0
|
Merge pull request #712 from edy-b/issue-707
Don't set cached cookies, fixes issue #707
|
2012-05-17 04:57:22 -07:00 |
|
Edy
|
e8639d87ce
|
fixes issue #707
Don't set cached cookies
|
2012-05-17 12:08:19 +02:00 |
|
Egil Moeller
|
fc946ffc33
|
Hide editing buttons when in readonly mode
|
2012-05-17 12:03:38 +02:00 |
|
Chad Weider
|
a9eb2d4e31
|
Fix ordering of editer code loading operations.
|
2012-05-14 19:01:00 -07:00 |
|
Chad Weider
|
9b0e2287aa
|
Add plugin framwork to common package.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
1a2c6425e1
|
Extract ace2_common into its own package.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
384523859e
|
Require ace2_common separately.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
97c7842d19
|
Remove unused line.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
4680bfaee8
|
Upgrade yajsml version.
Fixes parent-relative redirects and prints results more nicely.
|
2012-05-14 18:14:50 -07:00 |
|
Chad Weider
|
d65092e067
|
Move id, '*link' to the link.
|
2012-05-14 17:11:05 -07:00 |
|
Chad Weider
|
9942c577dc
|
Patch tablet styling.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
5d0c853889
|
Remove unnecessary styles.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
f802a79da6
|
Make styles less restrictive.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
818c3ef40d
|
Shift button appearance onto anchor.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
089e0227fd
|
Shift editbar styles around.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
1ea889bfab
|
Anchors are not icons
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
2a3fce0cf1
|
The showusers control is an anchor.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
ab8b2cae21
|
Remove nonsense styles.
|
2012-05-13 15:33:22 -07:00 |
|
Chad Weider
|
dc0fb12b09
|
Remove onclick attributes from editbar.
|
2012-05-13 15:33:22 -07:00 |
|
John McLear
|
def904dbed
|
remove wordle
|
2012-05-13 20:20:18 +01:00 |
|
John McLear
|
dc8495765f
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into removeWordle
|
2012-05-13 20:15:39 +01:00 |
|
John McLear
|
a3075b2137
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop
|
2012-05-13 14:56:29 +01:00 |
|
John McLear
|
916e52a1eb
|
Merge pull request #609 from prauscher/disable-passwords
Disable passwords
|
2012-05-13 06:55:47 -07:00 |
|
johnyma22
|
f1562ab568
|
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
|
2012-05-13 14:53:29 +01:00 |
|
John McLear
|
c70d88eedc
|
Merge pull request #667 from fourplusone/feature/cleaner_code
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
|
2012-05-13 06:51:58 -07:00 |
|
0ip
|
99ecadc0c3
|
Fix #655, wrong located APIKEY.txt
|
2012-05-13 00:34:26 +03:00 |
|
John McLear
|
476065b68d
|
Merge pull request #627 from edy-b/body-block
add more blocks to pad.html
|
2012-05-12 14:18:28 -07:00 |
|
0ip
|
c406d076de
|
Updated socket.io
|
2012-05-02 19:12:57 +03:00 |
|