mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-15 03:26:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2682 commits 214 branches 107 tags 80 MiB
Commit graph

2682 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
57adcc2dd6 Update bin/installDeps.sh 
Changed jquery version from 1.7.1 to 1.8.3 which seemed to work without problems in my tests.
Strangely every 1.8.x version above 1.8.3 fails, as well as every 1.7.x version above 1.7.2...
 2013-02-02 02:23:53 +01:00
Manuel Knitza
615b9c0497 Update src/static/js/jquery.js 
Changed jquery version from 1.7.1 to 1.8.3 which seemed to work without problems in my tests.
Strangely every 1.8.x version above 1.8.3 fails, as well as every 1.7.x version above 1.7.2...
 2013-02-02 02:22:50 +01:00
John McLear
9c0f881811 Merge pull request #1444 from disy-mk/patch-1 
Update src/static/js/html10n.js
 2013-02-01 15:53:56 -08: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
John McLear
24c4572488 Merge pull request #1434 from spcsser/admin-index-plugable 
Hook for admin menus
 2013-01-30 12:36:23 -08: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
Marcel Klehr
7a0ad3235a Merge pull request #1433 from ether/release/1.2.7 
Release 1.2.7
 2013-01-30 07:29:49 -08:00
John McLear
594d53ee8b changelog and package file 2013-01-30 14:58:23 +00:00
John McLear
8012e1b668 Merge branch 'release/1.2.7' 2013-01-30 14:50:28 +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
e7cb7c46c1 Merge pull request #1428 from ether/padUsers-authorID 
Include author ID in padUsers response
 2013-01-29 09:41:39 -08:00
John McLear
9ed2a2bb8f Merge pull request #1426 from ether/notifications 
Modularize Notifications
 2013-01-29 08:50:34 -08:00
John McLear
a19ad983f1 docs for api change 2013-01-29 16:48:56 +00: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
4c5ef1f814 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-01-28 21:53:11 +00:00
John McLear
10c2ac2a69 have a nice changelog makes it easier for when we release 2013-01-28 21:52:14 +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
mluto
0b90e5752b Added a test to check the export-url 2013-01-28 21:38:56 +01:00
mluto
3002807741 Added tests for revision-jumping 2013-01-28 21:12:50 +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