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 |
|
John McLear
|
4bf3f7ab12
|
Merge pull request #1891 from dtygel/change-dialog-for-small-iframes
Change class 'popup' for the dialog to fit in small spaces
|
2013-09-17 10:34:25 -07:00 |
|
daniel tygel
|
1cfde05139
|
fix .popup CSS to fit in small spaces, like thin iframe
|
2013-09-17 11:26:11 -06:00 |
|
John McLear
|
ea8ee08470
|
Merge pull request #1883 from ether/fix/adminplugins/loading-and-scroll
Beautify infinite scroll
|
2013-09-12 07:43:20 -07:00 |
|
Marcel Klehr
|
2b46bc40a1
|
Beautify infinite scroll
|
2013-09-12 16:37:37 +02:00 |
|
Marcel Klehr
|
8073c62de3
|
Merge pull request #1882 from fviard/develop
Fix to check if searchTerm is not "undefined" before trying to use it to...
|
2013-09-12 05:50:39 -07:00 |
|
Marcel Klehr
|
c2e60a3919
|
Merge pull request #1850 from Wikinaut/develop
adding backlinks to main page on admin pages
|
2013-09-12 05:46:14 -07:00 |
|
Florent Viard
|
6f478c4de1
|
Fix to check if searchTerm is not "undefined" before trying to use it to filter search results.
Signed-off-by: Florent Viard <fviard@lacie.com>
|
2013-09-11 11:36:09 +02:00 |
|
John McLear
|
c4fcedbb8d
|
Merge pull request #1879 from Gared/binary-upload-fix
Add check if uploaded file only contains ascii chars when abiword disabled
|
2013-09-10 13:48:26 -07:00 |
|
Gared
|
b336e38637
|
Add check if uploaded file only contains ascii chars when abiword disabled
|
2013-09-10 21:58:28 +02:00 |
|
John McLear
|
4de986a1ae
|
Merge pull request #1877 from piratenfraktion-nrw/develop
allow users to have colons in password
|
2013-09-10 09:07:44 -07:00 |
|
vileda
|
43e1af93c1
|
allow users to have colons in password
|
2013-09-10 16:00:36 +02:00 |
|
Siebrand Mazeland
|
c08a4dd01f
|
Localisation updates from http://translatewiki.net.
|
2013-09-09 18:49:10 +00:00 |
|
John McLear
|
527b7ad7f8
|
Merge pull request #1874 from tonoman3g/fix-padUsers-http-api-call
fix padUsers http api call in PadMessageHandler.js.
|
2013-09-09 08:00:11 -07:00 |
|
tonoman3g
|
e60591a4d5
|
fix padUsers http api call in PadMessageHandler.js.
Add callback() function call to iterator function.
|
2013-09-09 21:24:41 +07:00 |
|
Siebrand Mazeland
|
7ecf5f8c52
|
Localisation updates from http://translatewiki.net.
|
2013-09-02 18:50:54 +00:00 |
|
John McLear
|
1aa5981ce3
|
Update README.md
|
2013-09-02 13:56:17 +01:00 |
|
Marcel Klehr
|
e6dd23c282
|
Merge pull request #1861 from codingisacopingstrategy/correct-path-in-readme-doc-generator
Correct the path to the docs file used by the doc generator
|
2013-09-01 02:29:34 -07:00 |
|
Marcel Klehr
|
ed77bffbab
|
Merge pull request #1869 from codingisacopingstrategy/clarify-how-to-access-tests
Clarify how to acces tests
|
2013-09-01 02:28:21 -07:00 |
|
Eric Schrijver
|
384f500d4c
|
Clarify how to access tests
Add @marcelklehr’s clarification in https://github.com/ether/etherpad-lite/issues/1859
|
2013-09-01 11:23:31 +02:00 |
|
John McLear
|
20ae3b333b
|
Merge pull request #1868 from codingisacopingstrategy/encoding-fix-localization-dot-md
Fix encoding issue in localization.md
|
2013-09-01 02:01:10 -07:00 |
|
Eric Schrijver
|
4377f7a2e4
|
Fix encoding issue in localization.md
|
2013-09-01 10:57:31 +02:00 |
|