fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,068 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

4068 Commits

Author SHA1 Message Date
John McLear 9e8bad021c Merge pull request #2478 from ether/static-deps 
freeze deps
 2015-01-20 23:52:01 +00:00
John McLear 531d25ab84 freeze deps 2015-01-20 23:50:55 +00:00
John McLear 84638a39b7 Merge pull request #2469 from ether/new-sethtml-tests 
I need to do some more work on this at some point..  Leaving here
 2015-01-19 15:51:37 +00:00
John McLear 860c584b42 remove pointless comments 2015-01-19 15:44:16 +00:00
John McLear 5967e085b7 fix ul tests 2015-01-19 15:37:29 +00:00
John McLear f31b2fc9b5 Merge pull request #2471 from ether/ie-fix-backspace 
Ie fix backspace
 2015-01-19 15:16:55 +00:00
John McLear c315defc31 temp bodge fix 2015-01-19 15:15:52 +00:00
John McLear ab71bc7c20 hrm 2015-01-19 14:45:49 +00:00
John McLear edbeb66d5e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-19 14:33:17 +00:00
John McLear 44d1d6cc13 fix ie editing 2015-01-19 14:32:58 +00:00
John McLear 4ab4c9998b Merge pull request #2470 from cetra3/timeslider_proxy_fix 
Timeslider proxy fix
 2015-01-19 13:32:03 +00:00
Siebrand Mazeland 28aeeff154 Localisation updates from https://translatewiki.net. 2015-01-19 09:28:03 +01:00
Cetra Free f1c9c58c2d Update to timeslider to include base path for easier proxying 2015-01-19 14:28:30 +10:30
Cetra Free 3649118194 Update to timeslider to include base path for easier proxying 2015-01-19 14:25:06 +10:30
John McLear 3463b16d1a nearly there... 2015-01-19 03:04:23 +00:00
John McLear 7958f3b723 nearly fully working 2015-01-19 03:02:34 +00:00
John McLear 4f637befeb more fixing 2015-01-19 02:59:17 +00:00
John McLear 85fffbe14c more handling 2015-01-19 02:57:10 +00:00
John McLear cadb83ac5a bumpage 2015-01-19 02:51:32 +00:00
John McLear 13eff60dfe mheh I suck at css 0ip would do a way better job of this 2015-01-19 02:13:34 +00:00
John McLear 63c65f784b semi working example 2015-01-19 01:45:49 +00:00
John McLear 73d6030762 boop 2015-01-19 00:36:12 +00:00
John McLear 33c62329ba better regexp for line items 2015-01-19 00:28:32 +00:00
John McLear 0bd7914c3b dont paste on middle click of link 2015-01-18 23:58:47 +00:00
John McLear 6bc74a9adb more export logic handling 2015-01-18 23:33:29 +00:00
John McLear e50ea6ffea whoops proper regexp fix for listNumber 2015-01-18 23:24:20 +00:00
John McLear bd9ff770fe reset all numbers on first item 2015-01-18 23:21:34 +00:00
John McLear ce41bcea2f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-18 23:17:06 +00:00
John McLear af70902bef support deeper nested elements on exports 2015-01-18 23:16:58 +00:00
John McLear cbdfea9d16 Merge pull request #2466 from ether/remove-infinite 
remove infinite load was causing pain
 2015-01-18 23:04:55 +00:00
John McLear 7e69bc65ce remove infinite load was causing pain 2015-01-18 23:03:54 +00:00
John McLear 689ced8443 and this one.. 2015-01-18 20:15:17 +00:00
John McLear c0a4051b7a use etherpads own yajsml 2015-01-18 20:12:02 +00:00
John McLear ca6b729ace fix for ep page view pageup/down 2015-01-18 19:58:38 +00:00
John McLear 83fae22279 allow list text entry up to 16 items 2015-01-18 15:32:48 +00:00
John McLear 3c692faa8c Merge pull request #2465 from Gared/change_domain_plugins_json 
Change domain for plugins.json request
 2015-01-18 13:26:56 +00:00
Stefan 3c6db077ed Change domain for plugins.json request 2015-01-18 14:22:27 +01:00
John McLear df47bb9b04 Merge pull request #2464 from Gared/plugin_page_improvements 
Plugin page improvements
 2015-01-18 13:21:54 +00:00
Stefan 4644073399 Prevent dublicates in search results 2015-01-18 13:56:30 +01:00
Stefan 6d6ddd7f9f Prevent form submit on plugin page 2015-01-18 12:15:41 +01:00
John McLear cbba7876c9 Merge pull request #2459 from nemetz/patch-1 
check for io.js
 2015-01-16 13:17:31 +00:00
nemetz 648ebc08d6 check for io.js 
Added a check for io.js
 2015-01-16 11:11:34 -02:00
John McLear b2616c820e Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-01-12 00:00:07 +00:00
John McLear a553b44dbc refix plugins 2015-01-11 23:59:18 +00:00
John McLear 10ebabd567 Merge pull request #2453 from Gared/new_ico 
Add new favicon (32x32) with associated svg file
 2015-01-11 23:57:35 +00:00
Stefan a080b12eac Add new favicon (32x32) with associated svg file 2015-01-11 22:40:56 +01:00
John McLear c106e71942 Merge pull request #2452 from TimothyGu/develop 
Support ejs 2.0
 2015-01-11 17:19:54 +00:00
Timothy Gu 9b9a747167 Support ejs 2.0 
Fixes #2437.

This is still relying on undocumented behavior, but should unbreak the app
in the mean time.
 2015-01-11 08:17:17 -08:00
Marcel Klehr 167e0aea59 Merge pull request #2442 from ether/fix/attribmanager-removeattribonline 
Finally fix AttribManager#removeAttributeOnLine
 2015-01-10 16:35:37 +01:00
John McLear 4f22f76cf6 Merge pull request #2447 from badboy/patch-1 
Removed useless use of cat
 2015-01-09 14:21:28 +00:00