public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,234 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1324 Commits (d69df917095c49e9cc98e13e98e9af2b78cb59b7)

Author SHA1 Message Date
John McLear 9bb0587447 working and jsonify obj 2013-03-19 16:40:51 +00:00
John McLear 2916b39c24 make sure the sessionID target is right 2013-03-19 16:21:04 +00:00
Marcel Klehr cb45c44b4d Merge pull request #1588 from disy-mk/patch-2 
fix #1586
 2013-03-19 08:47:26 -07:00
John McLear d0e656d0a6 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg 2013-03-19 13:59:07 +00:00
John McLear 7741f762e2 hook for chat msg 2013-03-19 02:21:53 +00:00
John McLear 07adb45503 Merge pull request #1643 from ether/fix/html10n-update 
Update html10n.js
 2013-03-18 14:38:22 -07:00
John McLear e49620ea07 update ueber for pg 2013-03-18 21:36:50 +00:00
Marcel Klehr b3dbf1c995 Update html10n.js 2013-03-18 22:29:42 +01:00
Marcel Klehr 2bc45de106 Fix #1639 by removing bodyParser middleware introduced with swagger REST API 2013-03-18 22:09:47 +01:00
John McLear 3562672a75 stop start point going negative 2013-03-18 18:44:01 +00:00
John McLear 27e9f91864 page up, down etc all working, still no shift page up/down for highlight but that never worked anyways 2013-03-18 18:03:37 +00:00
John McLear 9f54a65c88 refactored arrow keys now work after paste in chrome 2013-03-18 17:40:18 +00:00
Siebrand Mazeland 83ed9303da Localisation updates from http://translatewiki.net. 2013-03-18 00:43:57 +00:00
John McLear 3e0a80cb74 remove console log 2013-03-17 15:17:36 +00:00
John McLear 693b9b9b94 better mobile support for gritter messages, before it was awful 2013-03-17 01:23:31 +00:00
John McLear a1d9d27cde much cleaner way of showing / hiding overlay 2013-03-16 17:57:23 +00:00
John McLear 69a4ab76cf hide modal once reconnect is good 2013-03-16 17:50:53 +00:00
John McLear 13ad46aa67 a safer approach I think but still be careful 2013-03-16 13:19:12 +00:00
Marcel Klehr cd9c78998e Fix path.join in Settings.js 2013-03-16 09:47:10 +01:00
Marcel Klehr 54433db47f release v1.2.9 2013-03-15 21:43:29 +01:00
Marcel Klehr 84d44d5f0e Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets 
Fix clearing authorship colors which was broken by #1609
 2013-03-15 12:20:31 -07:00
Marcel Klehr de552df6db Fix clearing authorship colors which was broken by #1609 
Fixes #1620
 2013-03-15 18:08:51 +01:00
John McLear cf041dcb08 Merge pull request #1618 from ether/tidy-up 
Tidy up
 2013-03-14 14:32:13 -07:00
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 d72abceee7 escape .color 2013-03-14 18:18:14 -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
John McLear ac9b972358 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg 2013-03-14 12:01:09 -03: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
John McLear 83a820b720 new function for handling custom messages, allows objects to be sent, before we only allowed strings 2013-03-12 16:59:15 +00:00
Siebrand Mazeland acb4b4ebaf Localisation updates from http://translatewiki.net. 2013-03-11 04:52:12 +00: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
Jordan Hollinger 3cafa24982 Fix variable name typo in PadMessageHandler.padUsers 2013-03-07 09:37:03 -05:00
John McLear 0c9214bb27 bump v and changelog 2013-03-06 15:08:27 +00:00
John McLear 1e94eaa06c fix safari rtl dissapearing pad 2013-03-06 14:50:08 +00: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
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 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
Manuel Knitza 67a0730710 added nodemailer to package.json - fix #1586 2013-03-05 21:28:38 +01:00
John McLear 3dee4098b0 update ueberdb 2013-03-05 13:24:24 +00:00
Siebrand Mazeland 6c304f0480 Localisation updates from http://translatewiki.net. 2013-03-04 11:46:05 +00:00
John McLear 71f10bff5b Merge pull request #1568 from ether/client-stability 
stop the client disconnecting of the server sends out a bad revision #, ...
 2013-03-03 13:19:10 -08:00
Marcel Klehr c4966543ed Fix settings object having constructors of another vm.context 
This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object
Fixes #1570
 2013-02-28 16:16:26 +01:00
John McLear 994c4ebeed stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510 2013-02-27 19:29:59 +00:00
John McLear ebd8b85072 patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution 2013-02-27 16:17:50 +00:00
John McLear 18b6cf1534 Merge pull request #1523 from ether/store-sessions-in-db 
Store sessions in db
 2013-02-26 18:03:54 -08:00
John McLear 2c69066591 remove pointless stuff 2013-02-27 02:02:18 +00:00
John McLear ad52b40597 post correct url, heh 2013-02-26 13:24:24 +00:00
John McLear b2eb1b3814 post url with pad error msg 2013-02-26 13:14:17 +00:00
John McLear f915285f15 merge develop 2013-02-25 10:13:50 +00:00
John McLear 5b89242c5b Merge pull request #1538 from ether/timeslider-init-hook 
timeslider init hook
 2013-02-25 02:12:37 -08:00
Siebrand Mazeland 26ccb1fa3e Localisation updates from http://translatewiki.net. 2013-02-24 16:38:27 +00:00
John McLear 4a98ec3c23 resolve merge conflict 2013-02-20 22:37:27 +00:00
John McLear fb3e4a6232 only show clients on this pad resolves issue #1544 2013-02-20 16:10:27 +00:00
John McLear e52dc2b17c dont reset head count, use the one we should :) 2013-02-19 02:05:51 +00:00
John McLear 9eff8576ef timeslider init hook 2013-02-18 22:04:58 +00:00
John McLear cda3a0e78b a different approach 2013-02-18 21:03:52 +00:00
John McLear c986a8565a Merge pull request #1535 from ether/fix-extractPadData 
fix extract and checkPad
 2013-02-18 12:41:46 -08:00
Marcel Klehr 4592397bd9 Merge pull request #1491 from ether/export-txt-with-indent 
TXT Export Indentation on lists Edit
 2013-02-18 12:13:06 -08:00
John McLear ab81b5cfe9 dont jump pages 2013-02-18 19:46:31 +00:00
John McLear 5441179e78 dont jump pages 2013-02-18 19:38:25 +00:00
John McLear 1a177d730a Merge pull request #1536 from ether/timeslider-scripts-block 
Timeslider scripts block
 2013-02-18 11:34:53 -08:00
John McLear e7a07a495c Merge pull request #1531 from ether/fix-for-long-strings 
make the focus jump back to the left if it's required
 2013-02-18 11:26:46 -08:00
John McLear 2ee3d0469e Merge pull request #1533 from ether/indenting-text 
Indenting text
 2013-02-18 11:25:55 -08:00
John McLear 7fcc71710f dont exposrt sendSocketMs 2013-02-18 18:59:53 +00:00
John McLear 75fd27998e expose socket timeslider with a bad hack 2013-02-18 18:58:58 +00:00
John McLear 3f87a32a12 timestlider script block 2013-02-18 18:07:01 +00:00
John McLear 4cfac2f624 fix extract and checkPad 2013-02-18 08:29:25 -08:00
John McLear 77d03d3473 Try to add some sanity to indentation 2013-02-18 01:40:34 +00:00
John McLear 48ffbde731 allow colon to indent line 2013-02-18 01:10:54 +00:00
John McLear eeeeb04840 remove cruft 2013-02-18 00:37:47 +00:00
John McLear 6e46a53288 this is probably bad, please sanity check 2013-02-18 00:36:31 +00:00
John McLear 11a8295150 eureka 2013-02-18 00:29:53 +00:00
John McLear 6d7e709ecb Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db 2013-02-17 23:44:26 +00:00
John McLear 51a9ecf1f0 better support for other browsers 2013-02-17 21:19:15 +00:00
John McLear 7e023ce8e1 make the focus jump back to the left if it's required 2013-02-17 21:03:19 +00:00
Marcel Klehr 9ca2275432 Fixes #1498: Two-part locale specs in lang cookie wouldn't be read correctly 2013-02-17 21:35:46 +01:00
John McLear 04f609752f actually works 2013-02-17 18:05:25 +00:00
John McLear 6b47fb69d0 seems to be working pretty well 2013-02-17 18:01:25 +00:00
John McLear 93d58b93be Update src/static/css/iframe_editor.css 2013-02-17 17:13:02 +00:00
Siebrand Mazeland 025a3aa724 Localisation updates from http://translatewiki.net. 2013-02-16 05:10:29 +00:00
John McLear 140ff6f1bf dont lose focus on key up, doesn't work yet 2013-02-15 12:24:16 +00:00
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 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
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 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 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
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
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
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
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 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
John McLear bcf9c23b4e dont use HTML filter hooks on txt export 2013-02-10 19:38:16 +00:00
John McLear 626ee97669 kinda brutal way of stopping plugins being able to pass *s instead of attributes 2013-02-10 19:36:46 +00:00
John McLear a67a0950dd stop urls being encoded, not sure about other security implications here... 2013-02-10 19:21:27 +00:00
Siebrand Mazeland 5248dac016 Localisation updates from http://translatewiki.net. 2013-02-10 19:15:11 +00:00
John McLear 69a6d5468e a bit fairer 2013-02-10 17:53:17 +00:00
John McLear a378f48c00 remove console warns 2013-02-10 17:39:02 +00:00
John McLear d16b15f3eb begin support for better txt output 2013-02-10 17:34:34 +00:00
Marcel Klehr 6d2b1488d6 Reformat access log messages to improve readability 2013-02-10 16:14:48 +01:00
John McLear 3760b97170 Merge pull request #1489 from marcelklehr/feature/log-client-ips 
Log the client ip on pad access
 2013-02-10 07:09:56 -08:00
Marcel Klehr ee89696c4d Log the client ip on pad access with logger 'access' 
also, don't log every message with log level info!
 2013-02-10 16:03:49 +01:00
John McLear 2634e8120a Merge pull request #1485 from ether/readme-placeholder 
remove one less warning during install by having a readme placeholder
 2013-02-10 05:59:33 -08:00
Marcel Klehr 6191b01633 Merge pull request #1477 from ether/fix-opera-double-enter 
Fixes #940: opera double enter
 2013-02-10 05:10:38 -08:00
John McLear 85f18d1f92 no longer dep on npm as it's native 2013-02-10 03:39:20 +00:00
John McLear f617cefe54 no need for jshint and update wd 2013-02-10 03:30:08 +00:00
John McLear 8f2025067b remove one less warning during install by having a readme placeholder 2013-02-10 03:04:08 +00:00
John McLear 98d45af0f9 Merge pull request #1484 from disy-mk/develop 
jquery update 1.7.1 -> 1.9.1
 2013-02-09 18:18:40 -08:00
Manuel Knitza 7b3d567d0c .browser() support 
Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)
 2013-02-10 02:53:07 +01:00
John McLear cd77f3e637 Merge pull request #1483 from 0ip/ua 
Add UA functions
 2013-02-09 17:47:34 -08:00
Manuel Knitza 7389e90cd0 update jquery 1.7.1 -> 1.9.1 2013-02-10 02:37:17 +01:00
0ip c3a29d1480 Add missing export entry for the browser object 2013-02-09 22:35:10 +01:00
0ip 7ddfdc3935 Add UA functions 2013-02-09 22:26:47 +01:00
0ip 8a6b3c90e2 Fix loader styling 2013-02-09 21:29:11 +01:00
0ip 8fb8f0d3b6 Change settings layout 2013-02-09 21:22:23 +01:00
0ip 40734e6776 Fix table CSS 2013-02-09 20:58:57 +01:00
0ip ad54369bf1 Add doctype 2013-02-09 20:57:41 +01:00
John McLear a45a8a837d stop opera doing stupid things 2013-02-09 19:44:13 +00:00
0ip 21e1422be6 Drop 'lite' occurrences in /admin/* 2013-02-09 20:42:47 +01:00
0ip 52ff28dea0 Fix data attribute 2013-02-09 20:34:12 +01:00
0ip d2409288be Add data-title for responsive tables 2013-02-09 20:15:41 +01:00
0ip 34fd7726bd Fix :admin/index links 2013-02-09 17:55:11 +01:00
0ip b04e99bddc Tweak admin-UI 2013-02-09 17:54:39 +01:00
0ip dd29096ad7 Normalize view-ports 2013-02-09 17:47:52 +01:00
John McLear a93ff37879 fix opera by recreating a scheduler object 2013-02-09 16:42:47 +00:00
0ip ef0a6ce5ff Remove top-border 2013-02-09 17:39:08 +01:00
Marcel Klehr 5f79546c2a Merge pull request #1465 from mluto/kill-ep-stuff 
Removing old etherpad code
 2013-02-08 13:21:57 -08:00
mluto f2cd9e3adc Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this. 2013-02-08 22:06:28 +01:00
mluto e6454af5ed Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP 2013-02-08 22:00:17 +01:00
mluto fc60ab24fa Removed debug code, moved hash-setting after the param-checking 2013-02-07 15:34:10 +01:00
mluto 0d5b98a338 Removed isProPad, since all pads are public except for group-pads 2013-02-07 14:30:09 +01:00
mluto 0cbd4034b1 Killed pad_docbar.js as it's from the old etherpad and not used 2013-02-07 13:59:41 +01:00
mluto 6e8dcee650 Removed old chat-code 2013-02-07 11:15:16 +01:00
John McLear e78879c300 Merge pull request #1461 from ether/slider-nan 
stop slider showing NaN on tiny pads
 2013-02-06 15:45:39 -08:00
John McLear 488ebc20a4 Merge pull request #1446 from ether/allow-plugins-to-specify-specs 
Allow plugins to specify specs
 2013-02-06 15:43:39 -08:00
John McLear 284748adb7 stop slider showing NaN on tiny pads 2013-02-06 23:35:58 +00:00
John McLear adaded343d better fix for IE8 page up down 2013-02-06 20:09:30 +00:00
root 9fcabfa8ac fix IE8 styling y u no do this 0ip? 2013-02-06 20:02:24 +00:00
John McLear dd49c71af9 fixes IE8 error by only redifining if firefox 2013-02-06 19:43:28 +00:00
John McLear 5b31030958 Merge pull request #1454 from dmitryuv/feature/socketio-rooms 
socket.io rooms instead of own session management
 2013-02-05 16:09:25 -08:00
Dmitry 34f9f15150 socket.io rooms instead of own session management 
Replaces homegrown pad session management with socket.io build-in rooms
 2013-02-05 23:33:44 +04:00
Jordan Hollinger 718421a46d Bugfixes to getChatHistory API method 2013-02-04 00:57:51 -05:00
John McLear da0b331502 Make async and cleaner 2013-02-04 00:00:39 +00:00
Peter 'Pita' Martischka eaa835630c Support Page Up and Page Down in ace 2013-02-03 17:39:49 +00:00
Peter 'Pita' Martischka cba001341f Remove legacy mozilla specific code from ace inner 2013-02-03 14:03:10 +00:00
John McLear 8b8cf01785 put tests in static folder, still have a race condition no biggy 2013-02-03 13:53:44 +00:00
Peter 'Pita' Martischka d30daccb10 Don't handle selections that are not from the inner frame 2013-02-03 13:44:37 +00:00
John McLear 0ff9f53297 correct path 2013-02-03 00:18:24 +00:00
John McLear 594d272334 allow plugins to specify frontend test specs 2013-02-03 00:14:17 +00:00
Manuel Knitza b9b5ebf661 Update src/static/js/html10n.js 
Added missing semicolons (#1440)
 2013-02-01 21:28:22 +01:00
John McLear f8cc7e0d7b Merge pull request #1438 from mluto/plugin-search-case-senstive 
Made plugin search not casesensitive
 2013-01-31 10:13:37 -08:00
mluto 037478cbcd Made plugin search not casesensitive 2013-01-31 19:05:23 +01:00
Swen 360d5c150b Update html code to proper validate 2013-01-30 20:24:48 +01:00
Swen 7f5579c2ed Reverted change 2013-01-30 20:21:21 +01:00
Swen 1f348d911f Merge branch 'develop' into admin-index-plugable 2013-01-30 20:16:51 +01:00
Swen 621a410750 Merge remote-tracking branch 'ether_origin/develop' into develop 2013-01-30 20:08:53 +01:00
John McLear 594d53ee8b changelog and package file 2013-01-30 14:58:23 +00:00
John McLear 037ca9b3fd Merge pull request #1432 from mluto/rename-save-revision 
Renamed "Saved Revisions" to "Save Revision"
 2013-01-30 06:47:10 -08:00
mluto d669779eb8 Renamed "Saved Revisions" to "Save Revision" since it saves a revision.. 2013-01-30 15:45:48 +01:00
John McLear 1814c756ad Merge pull request #1431 from mluto/fix-userinfo-crash 
Fix USERINFO_UPDATE crash
 2013-01-30 06:43:37 -08:00
John McLear 5b285e2ffa Merge pull request #1430 from mluto/notification-on-startup 
Don't show notifications when loading the chat-messages.
 2013-01-30 06:33:47 -08:00
mluto 7e48e025c7 Check for missing payload on CLIENT_MESSAGE 2013-01-30 15:28:54 +01:00
mluto f2742c5b63 Check for missing userInfo 2013-01-30 15:21:25 +01:00
mluto b5eeeb7dc2 Don't show notifications when loading the chat-messages. 2013-01-30 12:16:32 +01:00
John McLear edd8b12049 push authorID to author object and return via api... 2013-01-29 16:45:09 +00:00
John McLear daaa650a1b remove message about requiring comments 2013-01-29 12:15:11 +00:00
John McLear a7361f5ce0 make tinycon update on all chat messages not just ones that mention your name 2013-01-29 12:09:16 +00:00
John McLear fa7952523e spacing 2013-01-29 02:08:37 +00:00
John McLear 1c7810783c gritter now implemented 2013-01-29 01:55:36 +00:00
John McLear 2ae3dae492 introduce gritter files and ensure its available 2013-01-29 00:46:36 +00:00
John McLear c6f997981b Merge pull request #1417 from ether/diff-view 
Adds an API endpoint for Diff view
 2013-01-28 13:50:31 -08:00
John McLear e1cd34763d Merge pull request #1418 from mluto/timeslider-jump-revisions 
Jump to revisions in timeslider
 2013-01-28 13:29:47 -08:00
mluto 01fe5c183d Only set url if the revsion will actually be loaded 2013-01-28 21:44:21 +01:00
Marcel Klehr dcff3bddda Merge pull request #1413 from mluto/clean-getParams 
Rewrote getParams() to be more dynamic and shorter
 2013-01-28 12:03:31 -08:00
mluto a239158b49 Renamed paramSettings to getParameters, to cause less confusion 2013-01-28 20:17:34 +01:00
John McLear 51eff0d659 change to createDiffHTML 2013-01-28 16:53:29 +00:00
John McLear 4378561882 change to createDiffHTML 2013-01-28 16:52:23 +00:00
mluto f974136d0c Jump to revision given in URL, add current revision to URL 2013-01-28 10:13:37 +01:00
spcsser 80333d8e0a Added ability to add menu entries for admin pages. 2013-01-27 23:02:27 +01:00
Siebrand Mazeland 75b861e93b Localisation updates from http://translatewiki.net. 2013-01-27 19:41:00 +00:00
John McLear 3fac18f88a resolve merge conflict 2013-01-27 17:54:26 +00:00
John McLear ed5644d4e5 docs 2013-01-27 17:51:40 +00:00
Peter 'Pita' Martischka 878fd7631c Fixed HTML export 2013-01-27 17:25:50 +00:00
Peter 'Pita' Martischka 07a267be7a Added colors to pad diff 2013-01-27 16:45:09 +00:00
Peter 'Pita' Martischka dcfb1b2ea4 Added missing functions to create pad diffs 2013-01-27 15:40:37 +00:00
Peter 'Pita' Martischka f4690dda9d fixed indent 2013-01-27 15:40:05 +00:00
mluto 7432b7aff9 Rewrote getParams() to be more dynamic and shorter 2013-01-27 11:02:15 +01:00
John McLear e811037300 Merge pull request #1411 from ether/feature/plugin-update-checker 
plugin update checker
 2013-01-26 13:36:11 -08:00
Marcel Klehr 541aeb3a98 /admin/plugins: Display an update button for all plugins that are outdated 2013-01-26 22:15:19 +01:00
Marcel Klehr 0549a4fec7 Add checkUpdates endpoinnt for /admin/plugins 2013-01-26 22:13:28 +01:00
John McLear 1290fa36c3 typo fix 2013-01-26 20:05:37 +00:00
John McLear 9d0672c1c8 not a perfect css fix but stops the overflow when screen is less than 1000px 2013-01-26 20:04:33 +00:00
John McLear 090508909e Merge pull request #1389 from ether/disconnect-eejs-block 
add eejs block for disconnect
 2013-01-26 09:06:53 -08:00
John McLear 0ccd1a30e9 Merge pull request #1390 from ether/html-head-block-eejs 
add a html block eejs so you can add a cache manifest
 2013-01-26 09:06:38 -08:00
John McLear 51daaf02ce Merge pull request #1407 from mluto/hardcoded-i18n 
i10ze hardcoded message, update some messages on lang-change
 2013-01-26 07:19:04 -08:00
mluto cb2b93b133 Added getChatHistory and getChatHead (api+code+doc) 2013-01-26 14:35:26 +01:00
mluto 046fac9fa9 Added a comment to clearify *why* this works 2013-01-25 20:38:24 +01:00
mluto 763864539f Use 'html10n' instead of '_', i10nzed "unnamed author(s)" 2013-01-25 17:41:33 +01:00
mluto 4a20a26cbf Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n 2013-01-25 17:14:56 +01:00
mluto 509f564cd7 re-formated onelined en.json 2013-01-25 17:06:57 +01:00
Marcel Klehr 2841bfc009 Merge branch 'feature/real-time-plugin-search' into develop 2013-01-25 14:50:51 +01:00
mluto 7812d93e74 Fixed "unnamed" and "enter your name" in userlist 2013-01-25 10:32:09 +01:00
John McLear 568b641ee9 Merge pull request #1404 from ether/feature/real-time-plugin-search 
real-time plugin search
 2013-01-24 14:09:30 -08:00
Marcel Klehr 3e793b8a63 [/admin/plugins] remove progress history 2013-01-24 23:00:56 +01:00
Marcel Klehr 23dd4c73e2 pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message 2013-01-24 22:40:31 +01:00
Marcel Klehr fa55cd4759 [/admin/plugins] Add real-time on keypress search 
also, I reduced the size of the activity indicator
 2013-01-24 22:39:52 +01:00
John McLear 1f7140345a index wrapper block 2013-01-24 20:03:07 +00:00
John McLear ccc06b08ee Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu 
Add a unified menu to all admin pages
 2013-01-24 10:00:58 -08:00
Marcel Klehr 7c06dc750c Unify admin page titles 2013-01-24 18:46:32 +01:00
Marcel Klehr 2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
John McLear 569fb8d3c8 silly little bug now resolved 2013-01-24 16:48:40 +00:00
John McLear 18b96b33c6 Merge pull request #1379 from ether/more-plugin-details 
resolve #1349 - add url to plugin name
 2013-01-24 07:29:30 -08:00