libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 06:52:46 +01:00
Code Issues Projects Releases Wiki Activity
3018 commits 207 branches 105 tags 123 MiB
Commit graph

3018 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
81f0ef73ab beginning of FE tests for caret tracking which is easily broken when you add weird line heights to pads 2013-03-17 22:15:18 +00:00
John McLear
f238ba2f26 Merge pull request #1636 from maixithn/patch-1 
Update README.md
 2013-03-17 14:25:44 -07:00
maixithn
b084cf4f28 Update README.md 2013-03-17 21:57:14 +01:00
John McLear
3e0a80cb74 remove console log 2013-03-17 15:17:36 +00:00
John McLear
693b9b9b94 better mobile support for gritter messages, before it was awful 2013-03-17 01:23:31 +00:00
John McLear
755965d904 Merge pull request #1632 from ether/enable-buttons-reconnect 
Enable buttons reconnect
 2013-03-16 10:58:27 -07:00
John McLear
a1d9d27cde much cleaner way of showing / hiding overlay 2013-03-16 17:57:23 +00:00
John McLear
69a4ab76cf hide modal once reconnect is good 2013-03-16 17:50:53 +00:00
John McLear
d26660bce1 Merge pull request #1629 from accolade/patch-1 
(( 2 typos
 2013-03-16 09:16:51 -07:00
accolade
f972d2a92d (( 2 typos 2013-03-16 17:05:23 +01:00
John McLear
13ad46aa67 a safer approach I think but still be careful 2013-03-16 13:19:12 +00:00
Marcel Klehr
a31605216f Merge branch 'release/1.2.9' 2013-03-15 21:43:58 +01:00
Marcel Klehr
54433db47f release v1.2.9 2013-03-15 21:43:29 +01:00
Marcel Klehr
84d44d5f0e Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets 
Fix clearing authorship colors which was broken by #1609
 2013-03-15 12:20:31 -07:00
Marcel Klehr
de552df6db Fix clearing authorship colors which was broken by #1609 
Fixes #1620
 2013-03-15 18:08:51 +01:00
John McLear
cf041dcb08 Merge pull request #1618 from ether/tidy-up 
Tidy up
 2013-03-14 14:32:13 -07:00
John McLear
5d12be940c return text instead of html 2013-03-14 18:28:35 -03:00
John McLear
383439629a specialkey doesnt even exist afaik 2013-03-14 18:27:32 -03:00
John McLear
1bb9d1d625 remove pointless + 2013-03-14 18:23:27 -03:00
John McLear
019b25daa2 Merge pull request #1617 from ether/replace-html-with-text 
escape .color
 2013-03-14 14:20:43 -07:00
John McLear
d72abceee7 escape .color 2013-03-14 18:18:14 -03:00
John McLear
dab82ca380 Merge pull request #1616 from ether/ff-key-tests 
fix tests in firefox as firefox fires on keypress not down
 2013-03-14 13:34:22 -07:00
John McLear
29c0d790b5 fix undo test 2013-03-14 14:48:23 -03:00
John McLear
24188d7007 this should pass more tests.. 2013-03-14 14:36:54 -03:00
John McLear
1462d8e80c now IE friendly 2013-03-14 14:22:58 -03:00
John McLear
6bac01009b missed an evt 2013-03-14 13:52:20 -03:00
John McLear
34c2cf40fa This isn't ideal, basically some browsers interact with keypress/keydown in different ways so this is a workaround but it's not perma 2013-03-14 13:51:23 -03:00
John McLear
12107859bb fix tests in firefox as firefox fires on keypress not down 2013-03-14 13:41:49 -03:00
John McLear
f0dee2d2ce Merge pull request #1615 from ether/fix/admin-relative-links 
redirect /admin to /admin/ so that the relative links work
 2013-03-14 08:01:11 -07:00
John McLear
ac9b972358 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg 2013-03-14 12:01:09 -03:00
Marcel Klehr
5fe60e7221 redirect /admin to /admin/ so that the relative links work 2013-03-14 15:59:39 +01:00
John McLear
10231db103 Merge pull request #1609 from ether/dont-crash-bad-author 
SECURITY PATCH: Don't crash pad if bad author data is passed to the server
 2013-03-13 16:08:21 -07:00
Marcel Klehr
c30b0b72b8 Validate all 'author' attribs of incoming changesets to be the same value as the current user's authorId 2013-03-13 22:23:35 +01:00
John McLear
babb33d825 add authorId to chat and userlist, possibly privacy/security issue? 2013-03-13 21:55:29 +01:00
Marcel Klehr
0bceac98e3 Merge pull request #1610 from ether/frontend-tests-refactor 
change test naming schema and add keystroke tests for relevant buttonpresses
 2013-03-13 13:48:43 -07:00
John McLear
b81be97f94 typo 2013-03-13 15:08:19 -03:00
John McLear
5690f2d01e not z, is b! 2013-03-13 15:06:08 -03:00
John McLear
b4ec07312b add keystroke tests for relevant buttonpresses and change naming schema to something more sane 2013-03-13 15:00:04 -03:00
John McLear
83a820b720 new function for handling custom messages, allows objects to be sent, before we only allowed strings 2013-03-12 16:59:15 +00:00
Siebrand Mazeland
acb4b4ebaf Localisation updates from http://translatewiki.net. 2013-03-11 04:52:12 +00:00
John McLear
0717ac7b88 Merge pull request #1602 from ether/chrome-linux-indent 
fix indent on chrome in linux
 2013-03-08 08:21:49 -08:00
John McLear
26a6765b50 fix indent on chrome in linux 2013-03-08 08:40:40 -08:00
John McLear
0b16d96c97 Merge pull request #1527 from nelsonsilva/swagger 
Initial work on new swagger based REST API
 2013-03-07 08:07:46 -08:00
John McLear
732ad2878f Merge pull request #1599 from jhollinger/develop 
Fix padUsers API method
 2013-03-07 06:50:01 -08:00
Jordan Hollinger
3cafa24982 Fix variable name typo in PadMessageHandler.padUsers 2013-03-07 09:37:03 -05:00
John McLear
f8e528bc42 Merge pull request #1598 from cebe/feature/import-to-all-dbms 
Created a script to import data to all dbms
 2013-03-07 05:39:22 -08:00
CeBe
62c13b4c3f typo 2013-03-07 14:10:54 +01:00
CeBe
70c329957d additional ouput for importSqlFile 2013-03-07 14:05:55 +01:00
CeBe
4026ba1815 fixed saved data to be escaped properly 2013-03-07 13:15:29 +01:00
CeBe
f2b173f566 improved output for importSqlFile 2013-03-06 22:38:18 +01:00