Commit graph

  • 293f6594a0 Merge 9ca2275432 into 93d58b93be Marcel Klehr 2013-02-17 12:36:37 -08:00
  • 9ca2275432 Fixes #1498: Two-part locale specs in lang cookie wouldn't be read correctly Marcel Klehr 2013-02-17 21:35:46 +01:00
  • 04f609752f actually works John McLear 2013-02-17 18:05:25 +00:00
  • 6b47fb69d0 seems to be working pretty well John McLear 2013-02-17 18:01:25 +00:00
  • 93d58b93be Update src/static/css/iframe_editor.css John McLear 2013-02-17 17:13:02 +00:00
  • 29b4a045e1 Moved semver logic to API. nelson.silva 2013-02-16 12:36:36 +00:00
  • f0bde9bf18 Added versioning to API functions nelson.silva 2013-02-16 11:51:10 +00:00
  • 025a3aa724 Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-02-16 05:10:29 +00:00
  • 140ff6f1bf dont lose focus on key up, doesn't work yet John McLear 2013-02-15 12:24:16 +00:00
  • cb42c857d1 Added getJSON and setJSON to the API Nelson Silva 2013-02-14 16:23:29 +00:00
  • 513485c6c9 Added JSON import Nelson Silva 2013-02-14 16:01:59 +00:00
  • 7c03bc2610 when exporting HTML include html and body John McLear 2013-02-14 01:13:23 +00:00
  • c723aefdfe when exporting HTML include html and body John McLear 2013-02-14 01:10:47 +00:00
  • 36814ed42b apply overlay and remove overlay instantly John McLear 2013-02-13 23:44:20 +00:00
  • 7f09ec25a2 no need for prefix and tidy double semi John McLear 2013-02-13 21:53:15 +00:00
  • efce99c3a1 session key in settings file OR generate temp key for instance John McLear 2013-02-13 21:51:09 +00:00
  • c3972bcb87 Update README.md John McLear 2013-02-13 20:14:15 +00:00
  • 1607af8753 Bitcoin yo. John McLear 2013-02-13 20:12:46 +00:00
  • aefd8d8d0d nice chars n no cruft John McLear 2013-02-13 18:45:45 +00:00
  • dea892213e Revert "allow non ascii chars in txt export" John McLear 2013-02-13 18:41:04 +00:00
  • be56272e66 allow non ascii chars in txt export John McLear 2013-02-13 18:30:55 +00:00
  • d3f730e2ba fix various issues dont stop random *'s appearing John McLear 2013-02-13 18:01:15 +00:00
  • 5b5176cc0c Merge pull request #1518 from eldiddio/fix-typo John McLear 2013-02-13 07:37:29 -08:00
  • 22e717a5f5 Merge 500f9b8b48 into 602d603658 Mark 2013-02-13 07:37:19 -08:00
  • 500f9b8b48 Fixed typo thats made server hang Mark Fisher 2013-02-13 15:25:27 +00:00
  • 602d603658 Merge pull request #1512 from disy-mk/patch-3 Marcel Klehr 2013-02-13 03:39:32 -08:00
  • 8a7726cb4b Merge fde10052ca into a4e5adab3e Manuel Knitza 2013-02-13 03:38:53 -08:00
  • 23a866da50 Added raw JSON export Nelson Silva 2013-02-13 10:26:56 +00:00
  • 9e3f367446 Added JSON export Nelson Silva 2013-02-13 10:19:10 +00:00
  • a4e5adab3e Update Ueber DB to fix MySQL Bug! John McLear 2013-02-13 02:47:24 +00:00
  • 5c9d081391 Begin supporting the database but still have a problem where it generates new key on restart... John McLear 2013-02-13 01:33:22 +00:00
  • 198110eb4b drunk comments John McLear 2013-02-12 23:49:43 +00:00
  • 9e1dfc9487 docs for setHTML John McLear 2013-02-12 23:44:09 +00:00
  • e152c477c7 include the callback call, for sanity and stop the pad from being nuked so early in the function John McLear 2013-02-12 23:38:02 +00:00
  • 086132de66 dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad John McLear 2013-02-12 23:23:44 +00:00
  • fde10052ca Update doc/api/http_api.md Manuel Knitza 2013-02-12 21:57:01 +01:00
  • 8c9ad6ee50 Update src/node/handler/APIHandler.js Manuel Knitza 2013-02-12 21:50:14 +01:00
  • d6c0c67914 Merge e855bafdf9 into 14dca92692 Manuel Knitza 2013-02-12 12:48:12 -08:00
  • e855bafdf9 Update src/node/hooks/express/apicalls.js Manuel Knitza 2013-02-12 21:47:40 +01:00
  • 37534e1027 Merge 65f1b9c6aa into 14dca92692 Manuel Knitza 2013-02-12 12:38:57 -08:00
  • 65f1b9c6aa Update src/node/hooks/express/apicalls.js Manuel Knitza 2013-02-12 21:38:54 +01:00
  • 4d65c41dfb Update src/node/handler/APIHandler.js Manuel Knitza 2013-02-12 21:37:09 +01:00
  • 3bb475515a Update src/node/hooks/express/apicalls.js Manuel Knitza 2013-02-12 21:32:01 +01:00
  • e5525d4e16 Update src/node/hooks/express/apicalls.js Manuel Knitza 2013-02-12 21:29:32 +01:00
  • e59496fbe7 Update src/node/hooks/express/apicalls.js Manuel Knitza 2013-02-12 21:28:42 +01:00
  • 26f7ae0e55 Update src/node/handler/APIHandler.js Manuel Knitza 2013-02-12 21:21:10 +01:00
  • da246d183d Correct license header John McLear 2013-02-12 19:47:53 +00:00
  • 0b5c948549 Move code from Html export to a Helper file John McLear 2013-02-12 19:45:46 +00:00
  • 14dca92692 Merge pull request #1505 from ether/fix-for-long-strings John McLear 2013-02-12 11:06:45 -08:00
  • 819a21f41e Merge 2f20461445 into 760bebc429 John McLear 2013-02-12 11:06:30 -08:00
  • 760bebc429 Merge pull request #1507 from ether/ace2_inner-fix John McLear 2013-02-12 11:06:25 -08:00
  • 45c9c79dc0 Merge a37d396577 into bf6958ad57 John McLear 2013-02-12 11:05:22 -08:00
  • a37d396577 fix issue where opera was doing stupid things but still an issue w/ double tabs exists John McLear 2013-02-12 19:04:43 +00:00
  • bf6958ad57 Update bin/loadTesting/README John McLear 2013-02-12 15:04:06 +00:00
  • 9c54f024aa Bump to latest ueber to support sqlite John McLear 2013-02-12 13:15:57 +00:00
  • 2f20461445 a comment John McLear 2013-02-12 00:13:47 +00:00
  • 5f73a5ec30 very simple fix that might break other things but stops the caret focus being moved to the end of new lines when a long string without spaces is pasted into a pad John McLear 2013-02-12 00:08:44 +00:00
  • 24485283fd Merge pull request #1504 from ether/feature/bringJqueryBack John McLear 2013-02-11 14:05:31 -08:00
  • 1835e209be Merge b76e49ecde into 00af6d9c6a Peter 'Pita' Martischka 2013-02-11 14:05:29 -08:00
  • 00af6d9c6a Merge pull request #1503 from ether/feature/ffFixes John McLear 2013-02-11 14:05:24 -08:00
  • b76e49ecde Checked JQuery back in. Temporary fix for #1499 Peter 'Pita' Martischka 2013-02-11 21:22:16 +00:00
  • f14c9d2006 Merge 0953a5ac33 into e87843c5ae Peter 'Pita' Martischka 2013-02-11 12:52:28 -08:00
  • 0953a5ac33 Brought scheduler back completly, fixes #1502 Peter 'Pita' Martischka 2013-02-11 20:51:40 +00:00
  • ea0751c16e Merge ff88c19fc1 into e87843c5ae Manuel Knitza 2013-02-10 22:41:50 -08:00
  • ff88c19fc1 Add API endpoint to return padID for a readOnlyID Manuel Knitza 2013-02-11 07:40:03 +01:00
  • 97402f60b8 Add API endpoint to return padID for a readOnlyID Manuel Knitza 2013-02-11 07:37:59 +01:00
  • 5c97c38b6e API: Query latest version Manuel Knitza 2013-02-11 05:54:24 +01:00
  • e87843c5ae Merge pull request #1495 from disy-mk/patch-1 John McLear 2013-02-10 18:19:56 -08:00
  • d8bfc9c0fb Merge b1586684c8 into 1a77e57503 Manuel Knitza 2013-02-10 18:03:44 -08:00
  • b1586684c8 Explicitly log creation of pad Manuel Knitza 2013-02-11 03:03:18 +01:00
  • 60ef5f210a remove duplicate code to the best of my ability right now John McLear 2013-02-10 23:41:14 +00:00
  • 1a77e57503 Merge pull request #1487 from ether/dep-cleanup John McLear 2013-02-10 15:19:20 -08:00
  • 6a2f2f5a6e Merge 17a02bb024 into 29e2df7ad4 John McLear 2013-02-10 15:17:25 -08:00
  • 29e2df7ad4 Merge pull request #1494 from ether/feature/browserTests John McLear 2013-02-10 15:17:19 -08:00
  • 08a874091a Merge 25fd3c5901 into 9c4a2ef819 Peter 'Pita' Martischka 2013-02-10 14:43:24 -08:00
  • 17a02bb024 Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup Peter 'Pita' Martischka 2013-02-10 22:41:49 +00:00
  • b0f555e669 Revert "no longer dep on npm as it's native" Peter 'Pita' Martischka 2013-02-10 22:26:39 +00:00
  • 28f6d50011 remove console warn John McLear 2013-02-10 22:14:05 +00:00
  • 25fd3c5901 Windows and Mobile tests should be case insensitive Peter 'Pita' Martischka 2013-02-10 22:10:25 +00:00
  • 9c4a2ef819 Merge pull request #1493 from ether/feature/fixtests John McLear 2013-02-10 14:06:02 -08:00
  • 784644724e Merge 70c0591d35 into bd33061c8a Peter 'Pita' Martischka 2013-02-10 14:05:45 -08:00
  • 70c0591d35 Make iframe selectors work with jquery 1.9 Peter 'Pita' Martischka 2013-02-10 22:02:24 +00:00
  • 8d8487dfa6 Made jquery browser usable in testframework Peter 'Pita' Martischka 2013-02-10 21:49:00 +00:00
  • bd33061c8a Merge pull request #1492 from ether/feature/cleanup John McLear 2013-02-10 13:38:26 -08:00
  • e913bef10a Merge 1fbd408e82 into 3325aa8468 Peter 'Pita' Martischka 2013-02-10 13:28:47 -08:00
  • 1fbd408e82 replaced opera regex check with jquery browser check Peter 'Pita' Martischka 2013-02-10 21:21:22 +00:00
  • 500c451ba1 removed hack, because its uncessary now that scheduler is back Peter 'Pita' Martischka 2013-02-10 21:19:48 +00:00
  • 3325aa8468 bit of info about deps John McLear 2013-02-10 21:15:00 +00:00
  • d7992a1366 begin putting files together for a release John McLear 2013-02-10 21:13:51 +00:00
  • 5e041aaedb Moved old jquery recognition to seperate file Peter 'Pita' Martischka 2013-02-10 20:34:27 +00:00
  • 60de52477c jquery shouldn't be checked in Peter 'Pita' Martischka 2013-02-10 20:14:13 +00:00
  • bcf9c23b4e dont use HTML filter hooks on txt export John McLear 2013-02-10 19:38:16 +00:00
  • 626ee97669 kinda brutal way of stopping plugins being able to pass *s instead of attributes John McLear 2013-02-10 19:36:46 +00:00
  • a67a0950dd stop urls being encoded, not sure about other security implications here... John McLear 2013-02-10 19:21:27 +00:00
  • 5248dac016 Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-02-10 19:15:11 +00:00
  • 69a6d5468e a bit fairer John McLear 2013-02-10 17:53:17 +00:00
  • 5950f0f9c7 Merge a378f48c00 into e552e74feb John McLear 2013-02-10 09:39:28 -08:00
  • a378f48c00 remove console warns John McLear 2013-02-10 17:39:02 +00:00
  • d16b15f3eb begin support for better txt output John McLear 2013-02-10 17:34:34 +00:00
  • b7ed4e13ea Merge d001a7e040 into e552e74feb John McLear 2013-02-10 07:20:10 -08:00