John McLear
|
438f3fc717
|
Merge pull request #2030 from ether/import_hook
Working import hooks
|
2013-12-09 10:22:40 -08:00 |
|
John McLear
|
3180b96213
|
Remove console logs
|
2013-12-09 18:13:07 +00:00 |
|
John McLear
|
505dc70df5
|
Merge pull request #2013 from ether/getAttributeOnSelection
getAttributeOnSelection function
|
2013-12-09 09:46:57 -08:00 |
|
John McLear
|
bae77666a4
|
Merge pull request #2027 from webzwo0i/fix-import
fix closing of </title> tag
|
2013-12-09 06:56:22 -08:00 |
|
John McLear
|
d9ef40f9d7
|
docs but not sure how to specify the verison this was introduced
|
2013-12-07 17:48:06 +00:00 |
|
John McLear
|
8a547b24ba
|
resolve issue where first char showed all formatting
|
2013-12-07 17:37:52 +00:00 |
|
John McLear
|
98c4e32a14
|
Merge pull request #2026 from ether/afterEditHook
after Edit eejs block
|
2013-12-07 08:55:04 -08:00 |
|
webzwo0i
|
01c71085e4
|
fix closing of </title> tag
|
2013-12-07 00:18:36 +01:00 |
|
Siebrand Mazeland
|
03d5acfd0c
|
Localisation updates from https://translatewiki.net.
|
2013-12-05 22:01:36 +00:00 |
|
Marcel Klehr
|
37442d301c
|
Merge pull request #2021 from ldidry/fix-no-tab-indent
Replace tabs indentation with spaces indentation
|
2013-12-05 06:22:33 -08:00 |
|
Marcel Klehr
|
60017e9190
|
Merge pull request #2019 from ether/lighter-colors
allow for lighter colors
|
2013-12-05 05:42:14 -08:00 |
|
Luc Didry
|
3d8452b143
|
Replace tabs indentation with spaces indentation
Some files are obviously external libraries, I didn't touch them
|
2013-12-05 08:41:29 +01:00 |
|
John McLear
|
20b27c602c
|
Merge branch 'afterEditHook' of github.com:ether/etherpad-lite into getAttributeOnSelection
|
2013-12-04 23:36:26 +00:00 |
|
John McLear
|
749e557b84
|
after Edit eejs block
|
2013-12-04 23:17:32 +00:00 |
|
John McLear
|
378e07964b
|
allow for lighter colors
|
2013-12-04 23:01:08 +00:00 |
|
John McLear
|
03ff5563f4
|
Merge pull request #2017 from eloydegen/master
Update pad.html
|
2013-12-02 08:21:38 -08:00 |
|
Eloy
|
de3a657c6b
|
Update pad.html
Select the URL when click at the text.
|
2013-12-02 16:43:52 +01:00 |
|
Siebrand Mazeland
|
f2e63df9cb
|
Localisation updates from https://translatewiki.net.
|
2013-12-02 08:26:08 +00:00 |
|
John McLear
|
30f577e8f4
|
dont assume formatting is on the start of any line
|
2013-12-01 20:01:17 +00:00 |
|
John McLear
|
95db100f12
|
remove white space
|
2013-12-01 18:56:05 +00:00 |
|
John McLear
|
39f81fdb9e
|
remove post ace event
|
2013-12-01 18:55:42 +00:00 |
|
John McLear
|
3791ad4186
|
ends of line shouldn't show incorrect formatted status
|
2013-12-01 18:54:46 +00:00 |
|
John McLear
|
b4877f002d
|
handle logic for line lengths with 0
|
2013-12-01 18:06:56 +00:00 |
|
John McLear
|
e9f7583793
|
some nice css to that reflect when a button is active
|
2013-11-28 17:44:37 +00:00 |
|
John McLear
|
dee2dab7c4
|
getAttributeOnSelection function
|
2013-11-28 17:27:52 +00:00 |
|
John McLear
|
271dd663bf
|
foo
|
2013-11-28 17:22:34 +00:00 |
|
John McLear
|
6fcc7c77f9
|
not working and erally confused
|
2013-11-27 00:23:11 +00:00 |
|
John McLear
|
1fa2b32854
|
Merge pull request #1999 from s1341/fix_json_is_bad
strip off trailing commas
|
2013-11-26 05:16:42 -08:00 |
|
s1341
|
5181b3e467
|
add josnminify to package.json
|
2013-11-26 10:28:33 +02:00 |
|
s1341
|
9b7203d4d2
|
have the server parse the settings file using minify and strip commas
|
2013-11-26 10:20:59 +02:00 |
|
s1341
|
7550be0921
|
strip off trailing commas
|
2013-11-26 10:11:32 +02:00 |
|
John McLear
|
fb69e6b0a3
|
Merge pull request #2007 from ether/packaging
Debian deb file Packager
|
2013-11-25 09:40:04 -08:00 |
|
John McLear
|
b527ef2bc5
|
Merge pull request #2010 from ether/sticky-chat-resize
Sticky chat resize
|
2013-11-25 09:36:44 -08:00 |
|
John McLear
|
3be1ee5967
|
slightly cleaner
|
2013-11-25 17:36:24 +00:00 |
|
John McLear
|
252be19885
|
make sticky chat mroe responsive to changes in top bar
|
2013-11-25 17:33:33 +00:00 |
|
John McLear
|
81cf3a6ab3
|
Merge pull request #2008 from s1341/add_pad_copy
move copy/move pad into a new api version
|
2013-11-24 12:38:24 -08:00 |
|
s1341
|
45e0680484
|
move copy/move pad into a new api version
|
2013-11-24 22:34:56 +02:00 |
|
John McLear
|
8c1e066a02
|
mkdir
|
2013-11-24 13:13:29 +00:00 |
|
John McLear
|
97f5b581b0
|
cp readme on build
|
2013-11-24 13:08:26 +00:00 |
|
John McLear
|
1eef5278bd
|
growwlll
|
2013-11-24 12:51:50 +00:00 |
|
John McLear
|
6ee57746c9
|
whoopsi
|
2013-11-24 12:44:09 +00:00 |
|
John McLear
|
d6f1aa3236
|
clean
|
2013-11-24 12:41:12 +00:00 |
|
John McLear
|
678c80d1dc
|
whoa there, no need to include .git folder in build
|
2013-11-24 02:57:15 +00:00 |
|
John McLear
|
9d2f5e5cca
|
Merge branch 'packaging' of github.com:ether/etherpad-lite into packaging
|
2013-11-24 02:53:14 +00:00 |
|
John McLear
|
09429be4c9
|
whoops
|
2013-11-24 02:52:55 +00:00 |
|
John McLear
|
bb40644856
|
ignore deb and create user
|
2013-11-24 02:52:03 +00:00 |
|
John McLear
|
61df1facd2
|
semi-working build script for deb packages
|
2013-11-24 02:42:50 +00:00 |
|
John McLear
|
8b821d42a2
|
Merge pull request #2004 from ether/fix/walking-caret
Fix walking caret bug
|
2013-11-22 08:28:07 -08:00 |
|
Marcel Klehr
|
5d803a0523
|
Fix walking caret bug
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
|
2013-11-22 17:18:30 +01:00 |
|
Siebrand Mazeland
|
117a4ab1a8
|
Localisation updates from http://translatewiki.net.
|
2013-11-21 06:39:40 +00:00 |