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 |
|
John McLear
|
794a81f42b
|
Merge pull request #2449 from webzwo0i/fix-for-uls-without-class
fix for uls without class
|
2015-01-09 01:26:35 +00:00 |
|
webzwo0i
|
82efcdb430
|
fix for uls without class
|
2015-01-09 02:04:03 +01:00 |
|
Jan-Erik Rediger
|
1f558dc843
|
Removed useless use of cat
|
2015-01-08 14:16:07 +01:00 |
|
John McLear
|
f2c443809f
|
roll ejs back as its broken at v2
|
2015-01-07 15:18:54 +00:00 |
|
John McLear
|
1fd7574cfb
|
Merge pull request #2445 from webzwo0i/fix-importexport
fix importexport-tests
|
2015-01-07 14:22:25 +00:00 |
|
webzwo0i
|
ce156540ba
|
fix importexport-tests
|
2015-01-07 07:03:53 +01:00 |
|
John McLear
|
5dd64dfc77
|
Merge pull request #2443 from ether/exporthtmlendhook
final html export hook
|
2015-01-06 17:40:25 +00:00 |
|
John McLear
|
17ce67d936
|
final html export hook
|
2015-01-06 16:31:52 +00:00 |
|
Marcel Klehr
|
751adb24fd
|
Finally fix AttribManager#removeAttributeOnLine
return safely if the attribute wasn't found.
fixes #2394
|
2015-01-05 18:38:34 +01:00 |
|
John McLear
|
c0078abc75
|
Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection
|
2015-01-05 17:15:38 +00:00 |
|
John McLear
|
2e2dd688e9
|
Merge pull request #2436 from ether/check-for-abiword-path
check file system that abiword exists
|
2015-01-05 17:14:43 +00:00 |
|
John McLear
|
26c839063f
|
check file system that abiword exists
|
2015-01-04 14:47:08 +00:00 |
|
Siebrand Mazeland
|
e2ea82f8df
|
Localisation updates from https://translatewiki.net.
|
2015-01-02 10:58:48 +01:00 |
|
John McLear
|
230302b132
|
fix timeslider stars and frontend tests, needs css polish
|
2015-01-01 22:40:45 +00:00 |
|
John McLear
|
be4782ae07
|
Merge pull request #2425 from ether/master
Merge pull request #2424 from ether/release/1.5.0
|
2015-01-01 17:25:24 +00:00 |
|
John McLear
|
cbfc8330cc
|
Merge pull request #2424 from ether/release/1.5.0
Release/1.5.0
|
2015-01-01 17:25:03 +00:00 |
|
John McLear
|
95af55992a
|
changelog
|
2015-01-01 17:13:50 +00:00 |
|
John McLear
|
45e90e138c
|
v number bump
|
2015-01-01 16:57:31 +00:00 |
|
Marcel Klehr
|
1451eecaf0
|
Re-implement ace_getAttributeOnSelection
|
2014-12-31 19:23:09 +01:00 |
|
John McLear
|
8eb723b906
|
patch for e1c683be3f
|
2014-12-31 14:16:10 +00:00 |
|
John McLear
|
036b7d2890
|
Merge pull request #2418 from ether/etherpad-export-and-import
Full Pad portability (Export/Import)
|
2014-12-31 13:32:09 +00:00 |
|
John McLear
|
4b6df17e99
|
Merge pull request #2421 from webzwo0i/fix-swagger
hack to avoid warnings in swagger usage
|
2014-12-31 13:27:00 +00:00 |
|
John McLear
|
83f62bb6a9
|
remove console log
|
2014-12-31 13:21:36 +00:00 |
|
John McLear
|
b5c671a9b6
|
Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs
Clean-up after removing list attribute: Remove list numbering attribute
|
2014-12-31 13:19:24 +00:00 |
|
John McLear
|
335bf3dc4a
|
more line polish
|
2014-12-31 01:46:53 +00:00 |
|
John McLear
|
01c667aa2e
|
export html more styles
|
2014-12-31 00:53:20 +00:00 |
|
webzwo0i
|
b0da214ad5
|
hack to avoid warnings in swagger usage
|
2014-12-30 18:06:41 +01:00 |
|
Marcel Klehr
|
cfe75c7f3f
|
Clean-up after removing list attribute: Remove list numbering attribute
|
2014-12-30 17:45:26 +01:00 |
|
Stefan
|
c20a7e9bce
|
Merge pull request #2406 from Gared/fix/author-not-set-callback
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
|
2014-12-30 14:55:49 +01:00 |
|
Stefan
|
5df638bfac
|
Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected
Notify user if cookies can't be created
|
2014-12-30 14:54:43 +01:00 |
|
John McLear
|
90e83ed6b5
|
more styling
|
2014-12-30 14:53:44 +01:00 |
|
John McLear
|
716b1c6113
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2014-12-30 14:44:55 +01:00 |
|
John McLear
|
16713d8b3b
|
some demo export loic for handling OL incrementation
|
2014-12-30 14:43:00 +01:00 |
|
John McLear
|
4687d226c6
|
Merge pull request #2417 from webzwo0i/fix-export
Fix ExportHtml.js list parsing code
|
2014-12-30 13:47:31 +01:00 |
|
John McLear
|
19c78212e8
|
Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished
Fix lineassembler not finished
|
2014-12-30 12:19:04 +01:00 |
|
John McLear
|
a07d1722fc
|
no errors on chrome client
|
2014-12-30 12:12:24 +01:00 |
|
John McLear
|
5ba3cab445
|
better take some responsibility
|
2014-12-30 00:13:01 +01:00 |
|
John McLear
|
ac4f9eb4ce
|
licensing
|
2014-12-30 00:12:26 +01:00 |
|
John McLear
|
99a239fa9a
|
remove console log
|
2014-12-30 00:10:08 +01:00 |