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
|
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 |
|
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 |
|
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 |
|
CeBe
|
76fbc29607
|
improved output for importSqlFile
|
2013-03-06 22:36:00 +01:00 |
|
CeBe
|
4b7238c2cd
|
improved output for importSqlFile
|
2013-03-06 22:28:00 +01:00 |
|
CeBe
|
db0d0d1f72
|
fixed problem with npm
|
2013-03-06 22:08:14 +01:00 |
|
CeBe
|
6dfc5f2c88
|
a script that allows importing old etherpad db
this script allows you to import the sql file generated with
convert.js into all supported dbms, not only MySQL
|
2013-03-06 21:24:19 +01:00 |
|
John McLear
|
0c9214bb27
|
bump v and changelog
|
2013-03-06 15:08:27 +00:00 |
|
John McLear
|
830357c81c
|
Merge pull request #1596 from ether/rtl-ltr-tests
ltr test and fix rtl test
|
2013-03-06 07:03:01 -08:00 |
|
John McLear
|
60df48e485
|
ltr test and fix rtl test
|
2013-03-06 15:02:05 +00:00 |
|
John McLear
|
29d8482ce7
|
Merge pull request #1595 from ether/safari-rtl-fix
fix safari rtl dissapearing pad
|
2013-03-06 06:51:22 -08:00 |
|
John McLear
|
1e94eaa06c
|
fix safari rtl dissapearing pad
|
2013-03-06 14:50:08 +00:00 |
|
John McLear
|
7ada830e2e
|
Merge pull request #1594 from ether/fix/rtl-option
Fix ace rtlIsTrue property setter
|
2013-03-06 06:48:43 -08:00 |
|
Marcel Klehr
|
5731ef7802
|
Fix ace rtlIsTrue property setter
|
2013-03-06 15:40:02 +01:00 |
|
John McLear
|
2a8038b9fe
|
Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting
Add a setting for RTL text direction (integrating the url paramter)
|
2013-03-06 05:58:47 -08:00 |
|
Marcel Klehr
|
603115c4bf
|
Merge branch 'master' into develop
|
2013-03-06 14:57:09 +01:00 |
|
nelson.silva
|
a5987285e0
|
Multiple REST endpoints (one per version)
|
2013-03-06 10:10:21 +00:00 |
|
Nelson Silva
|
8f279a6710
|
Added some fixes to make it work with the codegen
|
2013-03-06 10:10:21 +00:00 |
|
Nelson Silva
|
1cfc8eda19
|
Initial work on swagger
|
2013-03-06 10:10:21 +00:00 |
|
Marcel Klehr
|
760e1b82c3
|
Add a setting for RTL text direction (integrating the url paramter)
Fixes #1191
|
2013-03-05 23:12:00 +01:00 |
|
John McLear
|
fe0272b283
|
Merge pull request #1589 from ether/fix-ctrl-z
allow chrome to do control z type functionality, not sure why this was n...
|
2013-03-05 12:35:03 -08:00 |
|
John McLear
|
d124d9b26c
|
Merge pull request #1590 from ether/fix-tests-android
fix chat simulation test to work in android
|
2013-03-05 12:34:44 -08:00 |
|
John McLear
|
f9f8b1c079
|
allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway
|
2013-03-05 20:30:31 +00:00 |
|
John McLear
|
38499465c3
|
fix chat simulation test to work in android
|
2013-03-05 19:01:22 +00:00 |
|
John McLear
|
cb2d148734
|
Merge branch 'release/1.2.8'
|
2013-03-05 13:39:53 +00:00 |
|
John McLear
|
2b5cb2989c
|
Merge pull request #1585 from ether/changelog
changelog
|
2013-03-05 05:34:14 -08:00 |
|
John McLear
|
7f9a51e614
|
changelog
|
2013-03-05 13:33:09 +00:00 |
|
John McLear
|
dc4317b654
|
Merge pull request #1584 from ether/update-ueber
update ueberdb
|
2013-03-05 05:25:48 -08:00 |
|
John McLear
|
3dee4098b0
|
update ueberdb
|
2013-03-05 13:24:24 +00:00 |
|
Marcel Klehr
|
283f6d0ae6
|
Merge pull request #1581 from victorhooi/develop
Remove nested /* */ from settings.json.template
|
2013-03-04 05:06:25 -08:00 |