libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4120 commits 2 branches 0 tags 24 MiB
Commit graph

738 commits

Author SHA1 Message Date
webzwo0i
01c71085e4 fix closing of </title> tag 2013-12-07 00:18:36 +01:00
Luc Didry
3d8452b143 Replace tabs indentation with spaces indentation 
Some files are obviously external libraries, I didn't touch them
 2013-12-05 08:41:29 +01:00
John McLear
271dd663bf foo 2013-11-28 17:22:34 +00:00
John McLear
6fcc7c77f9 not working and erally confused 2013-11-27 00:23:11 +00:00
s1341
9b7203d4d2 have the server parse the settings file using minify and strip commas 2013-11-26 10:20:59 +02:00
s1341
45e0680484 move copy/move pad into a new api version 2013-11-24 22:34:56 +02:00
s1341
52a99eb9e5 fix bugs, add force option to overwrite destination 2013-11-18 08:25:46 +02:00
s1341
93fcab0461 change parameter names 2013-11-17 21:01:02 +02:00
s1341
29d8bb7716 add pad copy/move API functions 2013-11-17 17:02:44 +00:00
Luc Didry
4a9602cc57 Fix getRevisionChangeset API call making etherpad crash 2013-11-07 22:49:20 +01:00
Marcel Klehr
8ab2442cc9 Update padList correctly 
fixes #1971
 2013-11-01 14:16:26 +01:00
Marcel Klehr
7b84e7308b Merge branch 'metrics' into develop 
Conflicts:
	src/node/handler/PadMessageHandler.js
 2013-10-28 12:11:25 +01:00
Marcel Klehr
3ad4b1b837 stats: Add http500, memoryUsage, pendingEdits gauges 
and turn edits metric into a timer instead of a simple meter
 2013-10-27 21:43:32 +01:00
Marcel Klehr
387091c5c9 Expose current stats at /stats 2013-10-27 18:11:50 +01:00
Marcel Klehr
940f114a84 Record metrics with 'measured' 2013-10-27 17:42:55 +01:00
Kenan Sulayman
7ab65d7112 Refactors APIHandler:callAPI 
Refactors and optimizes the APIHandler->callAPI.
 2013-10-25 12:14:22 +02:00
Grant Woodford
fbe4e43c3d Privacy: Add an option to disable IP logging 2013-10-19 21:37:11 +02:00
John McLear
a120d78b7e Merge pull request #1943 from ether/fix/listAllPads-fix 
Pad list cache: You can't change the cache if it's not initiated
 2013-10-14 09:21:27 -07:00
Marcel Klehr
22b0bafafd Pad list cache: You can't change the cache if it's not initiated 
(as per 200f250717 - doh.)
 2013-10-14 18:20:24 +02:00
vileda
77c2313025 pass correct padID to checkAccess if pad is requested via readOnly link 2013-10-13 22:31:41 +02:00
Marcel Klehr
200f250717 You don't need the padList if you want to alter it 
Don't query the db for caching a list of pads if you only want to alter the list
 2013-10-13 21:20:19 +02:00
John McLear
680d9a2811 Don't try to populate padlist on each req 
This is an important fix, prolly wants merging into master ASAP.  

Before this fix each new pad request would re-populate the all pads object, this is a blocking procedure and slows down the loading to a point where it's almost useless :(

Testing didn't find this because our testing stack isn't populated with pad data :|  TLDR.  Our tests still suck, hard.
 2013-10-13 16:39:45 +01:00
Marcel Klehr
64392542f9 Merge pull request #1938 from ether/fix/unknown-connection-message 
Drop messages from unknown connections
 2013-10-12 11:24:51 -07:00
Marcel Klehr
aa77a615da Drop messages from unknown connections 
fixes #1908
 2013-10-12 18:51:04 +02:00
Marcel Klehr
048d55a64c Don't create new pad if a non-existant read-only pad is accessed 
fixes #1848
 2013-10-12 18:41:48 +02:00
Marcel Klehr
7f10b9a42f Add explanations for more disconnect scenarios 2013-10-10 21:11:15 +02:00
Marcel Klehr
de50efc71a Merge pull request #1927 from ether/fix/client-side-error-logging-in-server-log 
Polish logging of client-side errors on the server
 2013-10-10 11:14:54 -07:00
Marcel Klehr
b7c7685dc7 Polish logging of client-side errors on the server 2013-10-10 18:45:22 +02:00
Marcel Klehr
d4c99d40b8 Never keep processing a changeset if it's corrupted 2013-10-10 18:19:25 +02:00
Marcel Klehr
6689a3c02e Catch errors during preparation of client vars 
... and disconnect the user
 2013-10-10 16:38:41 +02:00
John McLear
d86d99bc16 Merge pull request #1925 from ether/move-padlist-init 
Move padlist init
 2013-10-09 11:45:59 -07:00
John McLear
2992e3ea2b clean up 2013-10-09 16:34:50 +01:00
John McLear
40a65bd41c more warns 2013-10-09 16:17:36 +01:00
John McLear
c93acdfc87 suggestion 2013-10-09 16:14:16 +01:00
Marcel Klehr
de73de38b1 Filter author attribs in client_vars.historicalAuthorData 2013-10-07 18:58:20 +02:00
Marcel Klehr
9fac515885 Revert "do not pass historical author data to read only users" 
This reverts commit b32aaaeb1b.
 2013-10-07 18:54:57 +02:00
John McLear
d7088031fa remove white space 2013-10-06 15:16:32 +01:00
John McLear
b32aaaeb1b do not pass historical author data to read only users 2013-10-06 15:15:43 +01:00
John McLear
37586d646e Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-author 
allow author manager to use custom error module
 2013-10-03 06:46:17 -07:00
John McLear
bf1e1c3007 allow author manager to use custom error module 2013-10-03 14:45:23 +01:00
Marcel Klehr
7b17bd58ae Merge branch 'pr/1756' into develop 
Conflicts:
	src/node/handler/SocketIORouter.js
 2013-09-29 16:45:12 +02:00
Eric Schrijver
b34224559d ‘Etherpad Lite’ -> ‘Etherpad’ 2013-09-29 13:57:37 +02: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
c615ccf514 dont crash on importing blank html 2013-09-27 14:47:34 +01: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
4bea3a348e strip title out of html during import, pesky abiword behavior 2013-09-21 23:29:32 +01:00
John McLear
204118eea5 dont crash on malformed HTML import 2013-09-21 16:11:56 +01: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
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
vileda
43e1af93c1 allow users to have colons in password 2013-09-10 16:00:36 +02: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
goldquest
842e09a7ad Merge branch 'upstream/develop' 2013-09-04 15:30:37 +02:00
Marcel Klehr
40f578cfbd Merge pull request #1816 from bit/sessioninfos 
export sessioninfos
 2013-07-23 05:14:45 -07:00
j
a62593e9a0 export sessioninfos so plugins can access it 
allows plugins to map client.id to author id
 2013-06-17 16:54:02 +02:00
goldquest
7528ddf610 typo 2013-05-29 16:54:39 +02:00
goldquest
121c02c74f Grant access, when valid session is available and sessionNoPassword is set 2013-05-29 16:53:14 +02:00
John McLear
2273cf9ed6 Merge pull request #1740 from ether/feature/add-cs-queue 
add a changeset queue
 2013-04-28 13:58:08 -07:00
Marcel Klehr
2c855de6f6 Add a server-side changeset queue per pad 
fixes #1573
 2013-04-27 23:04:42 +02:00
Spruce (Felix Fichte)
fb0bc31056 updated to use settings 
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
 2013-04-24 12:19:41 +02:00
spruce
6ea5efbcc3 Update SocketIORouter.js 
Changed the setting of client.remoteAddress
 2013-04-22 23:01:41 +03:00
John McLear
bf4c86ed94 better message for admins 2013-04-17 23:48:11 +01:00
John McLear
63b00b9010 Merge branch 'feature/add-cs-queue' of github.com:ether/etherpad-lite into dont-crash-noauth 2013-04-17 20:04:25 +01:00
John McLear
3b8621c6a0 dont crash on no auth, ust a bandaid 2013-04-17 19:50:05 +01:00
Marcel Klehr
cd288c70cb Don't block changeset queue with delivering changeset 2013-04-17 14:26:11 +02:00
Marcel Klehr
1c8b7a3661 Add a server-side changeset queue per pad 
fixes #1573
 2013-04-17 14:25:23 +02:00
cohitre
602380abb7 passing the ToolbarItem to the callback 2013-04-15 16:06:32 -07:00
John McLear
f987299a5d catch error on export 2013-04-15 23:01:08 +01:00
cohitre
0c52fb5e30 Normalizing how select and button commands are triggered. 2013-04-15 11:32:59 -07:00
Marcel Klehr
76e50e2c4d Refactor SocketIORouter 2013-04-15 20:29:06 +02:00
cohitre
90837437c5 Moving the toolbar plugin calls. 2013-04-13 12:06:51 -07:00
John McLear
4a5e63f105 Merge pull request #1693 from guyzmo/api_extension 
extension of the API (versioned 1.2.8)
 2013-04-09 14:49:11 -07:00
goldquest
cbf0535f97 browser detection was dropped in jquery 1.9, so we have to add the browser detection js file 2013-04-05 15:35:03 +02:00
Bernard `Guyzmo` Pratz
0e5a89becc added full comments to the new API functions. 
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
 2013-04-04 19:07:11 +02:00
Bernard `Guyzmo` Pratz
3df3b90bd9 fixed missing API functions declaration in API ; fixed a typo in APIHandler. 
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
 2013-04-04 19:06:51 +02:00
mluto
c5b4e4934d Kick the user if has already successfully authenticated but his session became invalid later 2013-04-03 11:19:26 +02:00
John McLear
5855e3d5bf weird styling 2013-04-02 23:17:25 +01:00
John McLear
57a9ccbb88 whoops, comments hurt 2013-04-02 23:16:28 +01:00
John McLear
9e523191ea whoops padid should be in payload.. 2013-04-02 23:15:16 +01:00
Guyzmo
8f1348b40b Added getAttributePool, getRevisionOfHead and getRevisionChangeset methods to API v1.2.8 
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
 2013-04-01 17:19:48 +02:00
Marcel Klehr
04a53c4402 Merge branch 'feature/support-node-0.10' into develop 
Conflicts:
	src/package.json
 2013-04-01 13:29:07 +02:00
mluto
911bfb30e4 Log when a sessionID in checkAccess is not found 2013-03-31 10:56:14 +02:00
mluto
30cae9097f When there is just one session and this one is invalid SecurityManager.checkAccess would cause the request to hang forever because the callback is omitted for each invalid session, this fixes this issue. 
validSession still remains false so this does not cause issues further down.
 2013-03-31 10:27:21 +02:00
mluto
7e3b288afc log things the log4js-way; put all the brackets on a new line 2013-03-30 20:46:56 +01:00
mluto
253a8e37fd Added debug-output to SecurityManager.checkAccess to indicate *why* an auth-try failed. 2013-03-30 20:34:45 +01:00
Manuel Knitza
358b07390e fix "util.pump() is deprecated. Use readableStream.pipe()" 
fix error introduced by b3988e3
 2013-03-30 15:42:10 +01:00
mluto
6af160ee56 Fix #1519: don't error in listSessionsOfGroup when there are non-existing sessions (by eldiddio) 2013-03-29 10:09:39 +01:00
John McLear
c6041bf0c2 Merge pull request #1675 from ether/fix/process-uncaughtException-event-handler-leak 
Don't leak event listeners for process:uncaughtException
 2013-03-27 12:06:30 -07:00
John McLear
09b32ea694 Merge pull request #1672 from ether/feature/admin-plugins-revamp 
/admin/plugins revamp
 2013-03-27 12:05:00 -07:00
John McLear
2abb993e8b Merge pull request #1607 from ether/custom-obj-msg 
Custom Object messages
 2013-03-27 11:50:56 -07:00
Marcel Klehr
c4d9a71156 /admin/plugins: Fix update check 2013-03-27 12:02:19 +01:00
Marcel Klehr
ac0018cdfa Don't leak event listeners for process:uncaughtException 2013-03-26 21:19:09 +01:00
Marcel Klehr
638cea5fd6 Install and uninstall plugins with style 
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile

Why? http://i.imgur.com/XoX6uYS.jpg
 2013-03-26 15:11:30 +01:00
Marcel Klehr
aca5d150e4 /admin/plugins: Don't list installed plugins as available 2013-03-26 11:58:31 +01:00
Marcel Klehr
e8bae61cf5 /admin/plugins: Add progress indicators and report errors 2013-03-26 11:19:36 +01:00
Marcel Klehr
773293991b admin/plugins: Allow people to sort search results 2013-03-25 23:09:03 +01:00
Marcel Klehr
079fdf0f38 Revamp /admin/plugins 
- dry up the client-side code
- use the new saner API of pluginfw/installer.js on the server
- Improve UX: allow user to infinitely scroll to display their results
 2013-03-25 17:20:10 +01:00
Marcel Klehr
0070eab416 Fix caching of npm search results and only make one registry request on /admin/plugins 
fixes #1488
 2013-03-25 12:45:23 +01:00
disy-mk
c78aad16ea adds missing semicolons in src/node/utils folder 2013-03-24 01:18:44 +01:00
John McLear
d515acae96 expires was never defined 2013-03-23 18:01:44 +00:00
John McLear
b3988e30d5 pump isdeprecated 2013-03-23 17:55:34 +00:00
John McLear
588fd399cd Merge pull request #1645 from ether/fix/import-without-files 
Don't break the whole server if an import failed because no files were u...
 2013-03-19 10:41:32 -07:00
Marcel Klehr
c30697cb07 Don't break the whole server if an import failed because no files were uploaded 
Fixes #1611
 2013-03-19 18:40:39 +01:00
Marcel Klehr
a628317b55 Log http on debug log level 
... and additionally log the response time
 2013-03-19 18:34:21 +01:00
John McLear
a9bd081a44 more clean up 2013-03-19 16:55:42 +00:00
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
John McLear
d0e656d0a6 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg 2013-03-19 13:59:07 +00: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
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
de552df6db Fix clearing authorship colors which was broken by #1609 
Fixes #1620
 2013-03-15 18:08:51 +01:00
John McLear
ffe7e65db6 allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test 2013-03-14 19:03:20 -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
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
cohitre
988653b8ce Toolbar hooks 2013-03-12 19:36:04 -07: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
cohitre
52aa7d3997 Registering commands on the ace toolbar 2013-03-10 15:42:12 -07:00
cohitre
292a3bd7b7 Setting up the right toolbar. 2013-03-09 14:57:42 -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
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
cohitre
c57bc444cd basic toolbar setup 2013-03-03 16:06:14 -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
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
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
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
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
7c03bc2610 when exporting HTML include html and body 2013-02-14 01:13:23 +00:00
John McLear
c723aefdfe when exporting HTML include html and body 2013-02-14 01:10:47 +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
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
John McLear
198110eb4b drunk comments 2013-02-12 23:49:43 +00:00
John McLear
e152c477c7 include the callback call, for sanity and stop the pad from being nuked so early in the function 2013-02-12 23:38:02 +00:00
John McLear
086132de66 dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad 2013-02-12 23:23:44 +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
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
28f6d50011 remove console warn 2013-02-10 22:14:05 +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
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
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
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
0d5b98a338 Removed isProPad, since all pads are public except for group-pads 2013-02-07 14:30:09 +01: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
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
John McLear
8b8cf01785 put tests in static folder, still have a race condition no biggy 2013-02-03 13:53:44 +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
John McLear
1814c756ad Merge pull request #1431 from mluto/fix-userinfo-crash 
Fix USERINFO_UPDATE crash
 2013-01-30 06:43:37 -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
John McLear
edd8b12049 push authorID to author object and return via api... 2013-01-29 16:45:09 +00:00
John McLear
2ae3dae492 introduce gritter files and ensure its available 2013-01-29 00:46:36 +00: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
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
f4690dda9d fixed indent 2013-01-27 15:40:05 +00: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
0549a4fec7 Add checkUpdates endpoinnt for /admin/plugins 2013-01-26 22:13:28 +01:00
mluto
cb2b93b133 Added getChatHistory and getChatHead (api+code+doc) 2013-01-26 14:35:26 +01:00
goldquest
74185e79ab use the existing padimpexp object from the parent window 2013-01-23 16:36:37 +01:00
John McLear
f1b9c213ee and semi working 2013-01-22 23:37:53 +00:00
John McLear
3fb2f02875 semi working 2013-01-22 23:16:49 +00:00
John McLear
d21585b880 mheh 2013-01-22 23:06:52 +00:00
John McLear
205d983225 make it crash 2013-01-22 22:48:05 +00:00
John McLear
5d416579ee bring in some padDiff stuff that doesnt suck 2013-01-22 22:33:51 +00:00
goldquest
666c0adcd2 script tag didn't link to right location 2013-01-22 16:42:56 +01:00
Jordan Hollinger
858d8e6e71 listAllPads should return an object, not an arraay. issue #1374 2013-01-18 11:13:03 -05:00
mluto
41cb5d8265 Added hook for clientVars and hook-doc 2013-01-14 22:51:26 +01:00
mluto
94f9b05c4c Only create clientVars when they are needed 2013-01-14 22:08:33 +01:00
John McLear
654654b4e1 Merge pull request #1342 from spcsser/feature/padlisting 
API & backend to list pads on epl instance
 2013-01-14 08:13:57 -08:00
John McLear
33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages 
Load more than 100 chat messages using a 'load more'-link
 2013-01-13 10:31:45 -08:00
Marcel Klehr
f4b95c5ca4 Add log4js config setting 2013-01-13 12:20:49 +01:00
spcsser
9687ecbb82 Modified pad list manager to return an ordered list. 2013-01-11 18:31:53 +01:00
Swen
e9726890a4 Edited getPads function to be able to work without callback 2013-01-11 04:43:59 +01:00
Swen
c9f137b2e5 Added functionality to use spcsser/ueberDB findKey functionality. 2013-01-09 20:45:39 +01:00
Swen
7a49c82e16 Added comments 2013-01-08 20:21:14 +01:00
Swen
8c3263a6ea Added comments 2013-01-08 20:19:10 +01:00
Swen
198754222d Added functionality to list pads on this server. 2013-01-08 20:14:01 +01:00
mluto
bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto
5592c4b0fe client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages 2013-01-06 16:11:48 +01:00
mluto
9484b92ae2 fixed and unified indenting, added comments in handleClientReady 2013-01-06 14:55:33 +01:00
Stephan Jauernick
9f9f7a627e corrected a documentation glitch for checkToken - clarified which token is validated 2013-01-02 15:14:46 +01:00
Marcel Klehr
b6c9b4ec30 Fix #1309 : Fix support for node v0.6 2012-12-31 15:47:42 +01:00
Marcel Klehr
ffc9bcf028 Bump API version for checkToken endpoint 2012-12-27 22:09:22 +01:00
Marcel Klehr
369e24682b Merge pull request #1297 from marcelklehr/migrate-to-html10n 
Migrate to html10n and allow plugin l10n
 2012-12-27 07:56:41 -08:00
John McLear
746396951d Resolve #1301 startup pointing at old bitly URL 2012-12-26 00:17:43 +00:00
Marcel Klehr
220e084484 Simplify local locale file format 2012-12-23 22:43:32 +01:00
Marcel Klehr
d84951cd04 Remove locale file converter (ini2json) 2012-12-23 18:31:59 +01:00
Marcel Klehr
7aba02f0cf Don't break if a plugin hasn't got a locales dir 2012-12-23 18:17:12 +01:00
Marcel Klehr
cf24e53eae Simplify server-side i18n code and make it a bit more understandable 2012-12-23 18:17:10 +01:00
Marcel Klehr
e34036513e There's no utf8, but there's utf-8 2012-12-23 18:17:03 +01:00
Marcel Klehr
3c3c1630b1 Revert "Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!" 
This reverts commit 5fb7a03fb34078a75fe5932563e5a9fe44c57015.
 2012-12-23 18:17:01 +01:00
Iván Eixarch
9d459687af fixed bug in parseIni 2012-12-23 18:16:56 +01:00
Iván Eixarch
bc0d9c854b use relativa path in import definitions of locales.json 2012-12-23 18:16:54 +01:00
Marcel Klehr
d9d0312a9e Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it! 
(As if we wouldn't look forward to that...)
 2012-12-23 18:16:52 +01:00
Marcel Klehr
e3f9ed37b4 Hacky solution for exploreDir error 
We should only traverse the directories of actual plugins instead
of traversing the whole node_modules folder
 2012-12-23 18:16:45 +01:00
Iván Eixarch
2b860986e8 support for json in i18n 2012-12-23 18:16:37 +01:00
Iván Eixarch
1f4a171f10 convert language files from ini to json 2012-12-23 18:16:35 +01:00
Iván Eixarch
f72ec3eb28 convert language files from ini to json 2012-12-23 18:16:19 +01:00
John McLear
a5965bcdb5 Merge pull request #1244 from Wikinaut/add-socketio-transport-protocol-parameter 
add socketTransportProtocols parameter
 2012-12-10 15:15:05 -08:00
Wikinaut
05e8c74307 removed console.log of transport protocols 2012-12-10 22:33:00 +01:00
John McLear
bf5283fa11 Fix issue #725 which was caused by a race condition 2012-12-10 11:34:53 +00:00
John McLear
f1ca9bb456 Merge pull request #1272 from stephan48/patch-1 
Added a checkToken Method for checking the Validity of the API Token
 2012-12-10 01:17:11 -08:00
Stephan Jauernick
4318d210ce Update src/node/db/API.js 
Corrected function documentation.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
26ece95905 Update src/node/db/API.js 
Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
2163c8be5c Update src/node/handler/APIHandler.js 
Added the checkToken function to the function array.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
8686da87e8 Update src/node/db/API.js 
Added a checkToken method for checking if the API token is valid.
 2012-12-07 11:28:03 +01:00
Wikinaut
5bf79971b8 merged upstream develop 2012-12-07 08:59:13 +01:00
John McLear
98e03c1d87 Merge pull request #1268 from ether/fix/eejs-block-caching 
Fix #1247, #1201: Don't cache eejs blocks!
 2012-12-06 12:13:39 -08:00
Marcel Klehr
c909ed256f Fix #1247, #1201: Don't cache eejs blocks! 
Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
 2012-12-06 18:35:35 +01:00
goldquest
1380fda2b2 use the parent window, not the top 2012-12-06 17:51:43 +01:00
Iván Eixarch
bf04a4686a avoid use of os.tmpDir() for node 0.6 compatibility 2012-12-06 11:49:04 +01:00
goldquest
7631096135 fix for multiple cookies support (Also fix for, when session is not valid anymore) 2012-12-06 02:01:38 +01:00
goldquest
4ce16b526e Added semicolons 2012-12-06 02:00:58 +01:00
Marcel Klehr
377ff1eade Fix #1219: Make api work if requireAuth is enabled 2012-12-05 14:04:48 +01:00
Iván Eixarch
a2b22652ce added direction language in English 2012-12-04 13:02:23 +01:00
Iván Eixarch
5f949b8457 Update language4translatewiki 0.1.3 2012-12-04 12:12:58 +01:00
Iván Eixarch
b21c4403b2 Merge remote branch 'ether/develop' into languages4translatewiki 2012-12-04 11:40:17 +01:00