Marcel Klehr
|
b7c7685dc7
|
Polish logging of client-side errors on the server
|
2013-10-10 18:45:22 +02:00 |
|
John McLear
|
d86d99bc16
|
Merge pull request #1925 from ether/move-padlist-init
Move padlist init
|
2013-10-09 11:45:59 -07:00 |
|
John McLear
|
2992e3ea2b
|
clean up
|
2013-10-09 16:34:50 +01:00 |
|
John McLear
|
40a65bd41c
|
more warns
|
2013-10-09 16:17:36 +01:00 |
|
John McLear
|
c93acdfc87
|
suggestion
|
2013-10-09 16:14:16 +01:00 |
|
John McLear
|
7663b2ec49
|
Merge pull request #1923 from ether/fix/filter-historicalAuthorData
filter historical author data
|
2013-10-07 10:20:01 -07:00 |
|
Marcel Klehr
|
de73de38b1
|
Filter author attribs in client_vars.historicalAuthorData
|
2013-10-07 18:58:20 +02:00 |
|
Marcel Klehr
|
9fac515885
|
Revert "do not pass historical author data to read only users"
This reverts commit b32aaaeb1b.
|
2013-10-07 18:54:57 +02:00 |
|
John McLear
|
7f42f70732
|
Merge pull request #1921 from ether/dont-pass-padid-in-historical-authors
Dont pass padid in historical authors
|
2013-10-06 07:31:44 -07:00 |
|
John McLear
|
d7088031fa
|
remove white space
|
2013-10-06 15:16:32 +01:00 |
|
John McLear
|
b32aaaeb1b
|
do not pass historical author data to read only users
|
2013-10-06 15:15:43 +01:00 |
|
Siebrand Mazeland
|
eb611e2b36
|
Localisation updates from http://translatewiki.net.
|
2013-10-05 21:56:44 +00:00 |
|
John McLear
|
37586d646e
|
Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-author
allow author manager to use custom error module
|
2013-10-03 06:46:17 -07:00 |
|
John McLear
|
bf1e1c3007
|
allow author manager to use custom error module
|
2013-10-03 14:45:23 +01:00 |
|
John McLear
|
6dc4240985
|
Merge pull request #1919 from ether/make-username-show-properly
use val not value, broken with newer jq
|
2013-10-02 16:37:29 -07:00 |
|
John McLear
|
d69df91709
|
use val not value, broken with newer jq
|
2013-10-03 00:36:15 +01:00 |
|
John McLear
|
ba1ff46867
|
Merge pull request #1917 from maixithn/patch-2
Update README.md
|
2013-10-02 06:09:34 -07:00 |
|
maixithn
|
0630b3e93a
|
Update README.md
delete double wordings
|
2013-10-02 14:00:48 +02:00 |
|
Marcel Klehr
|
7b17bd58ae
|
Merge branch 'pr/1756' into develop
Conflicts:
src/node/handler/SocketIORouter.js
|
2013-09-29 16:45:12 +02:00 |
|
John McLear
|
9afbedc908
|
Merge pull request #1862 from codingisacopingstrategy/etherpad-lite-to-etherpad
‘Etherpad Lite’ -> ‘Etherpad’
|
2013-09-29 07:03:22 -07:00 |
|
Eric Schrijver
|
b34224559d
|
‘Etherpad Lite’ -> ‘Etherpad’
|
2013-09-29 13:57:37 +02:00 |
|
John McLear
|
6e4d94069f
|
Merge pull request #1906 from ether/down-arrow-dont-be-weird
Down arrow dont be weird
|
2013-09-28 23:38:45 -07:00 |
|
John McLear
|
f59df2bb80
|
Merge pull request #1902 from ether/fix/handle-message-continuation
Don't stop processing changesets if there is an error
|
2013-09-28 23:38:26 -07:00 |
|
John McLear
|
e573461c9b
|
Merge pull request #1909 from ether/dont-crash-blank-html-import
dont crash on importing blank html
|
2013-09-27 12:06:05 -07:00 |
|
Marcel Klehr
|
56bc632d41
|
Merge pull request #1907 from ether/clear-cache
Press Ctrl and f5 to load clean page
|
2013-09-27 07:15:42 -07:00 |
|
John McLear
|
6fbdc2cfd9
|
whoops, not supposed to be there
|
2013-09-27 14:49:05 +01:00 |
|
John McLear
|
c615ccf514
|
dont crash on importing blank html
|
2013-09-27 14:47:34 +01:00 |
|
John McLear
|
7d1d73f8a6
|
doh, wasnt supposed to add this background
|
2013-09-25 22:20:13 +01:00 |
|
John McLear
|
ed04842801
|
more sensible reload without cache message
|
2013-09-25 22:18:51 +01:00 |
|
John McLear
|
c8109b7398
|
sanity also control home support
|
2013-09-25 15:56:56 +01:00 |
|
John McLear
|
487f1a969f
|
vast improvement on movement of caret due to isolation of cause of problem - TLDR is Chrome detects blank rows line heights as incorrect
|
2013-09-25 14:57:02 +01:00 |
|
John McLear
|
3e1e92c100
|
Merge pull request #1904 from ether/fix/plugin-search
/admin/plugins: Fix search algorithm (use string match in lower case)
|
2013-09-23 10:58:26 -07:00 |
|
Marcel Klehr
|
6a02302fc9
|
/admin/plugins: Fix search algorithm (use string match in lower case)
fix #1903
|
2013-09-23 19:55:35 +02:00 |
|
Marcel Klehr
|
7f7d506ff3
|
Don't stop processing changesets if there is an error
fixes #1895
|
2013-09-23 16:38:55 +02:00 |
|
John McLear
|
7898c350f7
|
Merge pull request #1900 from ether/dont-include-file-name-on-import
strip title out of html during import, pesky abiword behavior
|
2013-09-21 15:38:51 -07:00 |
|
John McLear
|
4bea3a348e
|
strip title out of html during import, pesky abiword behavior
|
2013-09-21 23:29:32 +01:00 |
|
John McLear
|
c30101ab42
|
Merge pull request #1899 from ether/import-button-styling
Import button styling
|
2013-09-21 08:24:19 -07:00 |
|
John McLear
|
240a96221a
|
Merge branch 'develop' of github.com:ether/etherpad-lite into import-button-styling
|
2013-09-21 16:23:12 +01:00 |
|
John McLear
|
e35c45e9b5
|
make export clearly seperated from import
|
2013-09-21 16:22:43 +01:00 |
|
John McLear
|
ca680a32b6
|
fix padding so export icons show properly
|
2013-09-21 16:17:19 +01:00 |
|
John McLear
|
05a8ae7acc
|
padding on import now button
|
2013-09-21 16:15:59 +01:00 |
|
John McLear
|
26d5a4fcca
|
Merge pull request #1898 from ether/fix-bad-html-on-import
Don't crash on malformed HTML import
|
2013-09-21 08:14:06 -07:00 |
|
John McLear
|
204118eea5
|
dont crash on malformed HTML import
|
2013-09-21 16:11:56 +01:00 |
|
John McLear
|
cf3c8e599f
|
Merge pull request #1897 from GuillaumeAmat/develop
Better display of the import/export popup
|
2013-09-21 07:47:22 -07:00 |
|
Guillaume AMAT
|
96adb4d626
|
The #importsubmitinput button was too small and hidden its value
|
2013-09-21 12:39:45 +02:00 |
|
Guillaume AMAT
|
6de3a400e1
|
The import/export columns were not displayed correctly
|
2013-09-21 12:38:26 +02:00 |
|
Marcel Klehr
|
c095c60284
|
Merge pull request #1893 from ether/fix/api/cginef-endpoint
API: fix createGroup for mapper endpoint for in case the group is deleted
|
2013-09-19 06:16:17 -07:00 |
|
Marcel Klehr
|
1bbe0293ac
|
Merge pull request #1851 from Karunamon/patch-1
Start script should use bash instead of sh for argument handling
|
2013-09-18 11:14:32 -07:00 |
|
Marcel Klehr
|
182ce5c48d
|
API: fix createGroup for mapper endpoint for cases when a mapped group has been deleted
fixes #1890
|
2013-09-18 16:04:10 +02:00 |
|
Michael Parks
|
f3987007b0
|
Back to sh, fix comparison for POSIX/dash (++ CentOS, Ubuntu compatibility)
|
2013-09-17 15:27:52 -06:00 |
|