libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,956 Commits 2 Branches 0 Tags 24 MiB
Commit Graph

2956 Commits

Author SHA1 Message Date
John McLear c723aefdfe when exporting HTML include html and body 2013-02-14 01:10:47 +00:00
John McLear 36814ed42b apply overlay and remove overlay instantly 2013-02-13 23:44:20 +00:00
John McLear 7f09ec25a2 no need for prefix and tidy double semi 2013-02-13 21:53:15 +00:00
John McLear efce99c3a1 session key in settings file OR generate temp key for instance 2013-02-13 21:51:09 +00:00
John McLear c3972bcb87 Update README.md 2013-02-13 20:14:15 +00:00
John McLear 1607af8753 Bitcoin yo. 2013-02-13 20:12:46 +00:00
John McLear aefd8d8d0d nice chars n no cruft 2013-02-13 18:45:45 +00:00
John McLear dea892213e Revert "allow non ascii chars in txt export" 
This reverts commit be56272e66.
 2013-02-13 18:41:04 +00:00
John McLear be56272e66 allow non ascii chars in txt export 2013-02-13 18:30:55 +00:00
John McLear d3f730e2ba fix various issues dont stop random *'s appearing 2013-02-13 18:01:15 +00:00
John McLear 5b5176cc0c Merge pull request #1518 from eldiddio/fix-typo 
Fixed typo thats made server hang
 2013-02-13 07:37:29 -08:00
Mark Fisher 500f9b8b48 Fixed typo thats made server hang 2013-02-13 15:25:27 +00:00
Marcel Klehr 602d603658 Merge pull request #1512 from disy-mk/patch-3 
Allow people to query current API version via /api
 2013-02-13 03:39:32 -08:00
John McLear a4e5adab3e Update Ueber DB to fix MySQL Bug! 2013-02-13 02:47:24 +00:00
John McLear 5c9d081391 Begin supporting the database but still have a problem where it generates new key on restart... 2013-02-13 01:33:22 +00:00
Manuel Knitza fde10052ca Update doc/api/http_api.md 
Updated
 2013-02-12 21:57:01 +01:00
Manuel Knitza 8c9ad6ee50 Update src/node/handler/APIHandler.js 2013-02-12 21:50:14 +01:00
Manuel Knitza e855bafdf9 Update src/node/hooks/express/apicalls.js 2013-02-12 21:47:40 +01:00
John McLear da246d183d Correct license header 2013-02-12 19:47:53 +00:00
John McLear 0b5c948549 Move code from Html export to a Helper file 2013-02-12 19:45:46 +00:00
John McLear 14dca92692 Merge pull request #1505 from ether/fix-for-long-strings 
very simple fix that might break other things but stops the caret focus ...
 2013-02-12 11:06:45 -08:00
John McLear 760bebc429 Merge pull request #1507 from ether/ace2_inner-fix 
fix issue where opera was doing stupid things but still an issue w/ doub...
 2013-02-12 11:06:25 -08:00
John McLear a37d396577 fix issue where opera was doing stupid things but still an issue w/ double tabs exists 2013-02-12 19:04:43 +00:00
John McLear bf6958ad57 Update bin/loadTesting/README 2013-02-12 15:04:06 +00:00
John McLear 9c54f024aa Bump to latest ueber to support sqlite 2013-02-12 13:15:57 +00:00
John McLear 2f20461445 a comment 2013-02-12 00:13:47 +00:00
John McLear 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 2013-02-12 00:08:44 +00:00
John McLear 24485283fd Merge pull request #1504 from ether/feature/bringJqueryBack 
Checked JQuery back in. Temporary fix for #1499
 2013-02-11 14:05:31 -08:00
John McLear 00af6d9c6a Merge pull request #1503 from ether/feature/ffFixes 
Brought scheduler back completly, fixes #1502
 2013-02-11 14:05:24 -08:00
Peter 'Pita' Martischka b76e49ecde Checked JQuery back in. Temporary fix for #1499 2013-02-11 21:22:16 +00:00
Peter 'Pita' Martischka 0953a5ac33 Brought scheduler back completly, fixes #1502 2013-02-11 20:51:40 +00:00
John McLear e87843c5ae Merge pull request #1495 from disy-mk/patch-1 
Explicitly log creation of pad
 2013-02-10 18:19:56 -08:00
Manuel Knitza b1586684c8 Explicitly log creation of pad 2013-02-11 03:03:18 +01:00
John McLear 60ef5f210a remove duplicate code to the best of my ability right now 2013-02-10 23:41:14 +00:00
John McLear 1a77e57503 Merge pull request #1487 from ether/dep-cleanup 
Dependancy cleanup
 2013-02-10 15:19:20 -08:00
John McLear 29e2df7ad4 Merge pull request #1494 from ether/feature/browserTests 
Windows and Mobile tests should be case insensitive
 2013-02-10 15:17:19 -08:00
Peter 'Pita' Martischka 17a02bb024 Merge branch 'develop' of github.com:ether/etherpad-lite into dep-cleanup 2013-02-10 22:41:49 +00:00
Peter 'Pita' Martischka b0f555e669 Revert "no longer dep on npm as it's native" 
This reverts commit 85f18d1f92.
 2013-02-10 22:26:39 +00:00
John McLear 28f6d50011 remove console warn 2013-02-10 22:14:05 +00:00
Peter 'Pita' Martischka 25fd3c5901 Windows and Mobile tests should be case insensitive 2013-02-10 22:10:25 +00:00
John McLear 9c4a2ef819 Merge pull request #1493 from ether/feature/fixtests 
Fixes for the testrunner
 2013-02-10 14:06:02 -08:00
Peter 'Pita' Martischka 70c0591d35 Make iframe selectors work with jquery 1.9 2013-02-10 22:02:24 +00:00
Peter 'Pita' Martischka 8d8487dfa6 Made jquery browser usable in testframework 2013-02-10 21:49:00 +00:00
John McLear bd33061c8a Merge pull request #1492 from ether/feature/cleanup 
Several code cleanups
 2013-02-10 13:38:26 -08:00
Peter 'Pita' Martischka 1fbd408e82 replaced opera regex check with jquery browser check 2013-02-10 21:21:22 +00:00
Peter 'Pita' Martischka 500c451ba1 removed hack, because its uncessary now that scheduler is back 2013-02-10 21:19:48 +00:00
John McLear 3325aa8468 bit of info about deps 2013-02-10 21:15:00 +00:00
John McLear d7992a1366 begin putting files together for a release 2013-02-10 21:13:51 +00:00
Peter 'Pita' Martischka 5e041aaedb Moved old jquery recognition to seperate file 2013-02-10 20:34:27 +00:00
Peter 'Pita' Martischka 60de52477c jquery shouldn't be checked in 2013-02-10 20:14:13 +00:00