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

951 commits

Author SHA1 Message Date
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
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