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
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
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
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
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
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
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