fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,813 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

2813 Commits

Author SHA1 Message Date
Marcel Klehr ab04a4e511 Merge pull request #1472 from ether/plugin-test-dcs 
docs for plugin-defined specs
 2013-02-09 07:57:33 -08:00
John McLear bb1d462612 plugin test docs 2013-02-09 15:45:00 +00: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
John McLear af022c8427 Merge pull request #1468 from mluto/fix-timeslider-test 
Fix the "jumps to a revision given in the url"-test
 2013-02-07 08:38:36 -08:00
mluto ae6a9c25ae Fixed "jumps to a revision given in the url" test 2013-02-07 17:34:31 +01:00
John McLear f65ad93fb9 Merge pull request #1467 from ether/fix-timeslider-tests 
fix timeslider tests
 2013-02-07 07:52:13 -08:00
John McLear 8c0fb090eb works in all 3 major browsers 2013-02-07 15:50:59 +00:00
John McLear 52afe86377 Merge branch 'develop' of github.com:ether/etherpad-lite into fix-timeslider-tests 2013-02-07 15:27:43 +00:00
John McLear f42d3820a5 fix timeslider tests 2013-02-07 15:24:30 +00:00
John McLear ea04e9c997 Merge pull request #1466 from mluto/timeslider-remove-debugging 
Removed debug code from Timeslider
 2013-02-07 06:36:30 -08: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
John McLear 889cec8f7c Merge pull request #1464 from mluto/old-chat-code 
Removed some old chat-code
 2013-02-07 04:12:46 -08: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 7bf8dad6f9 Merge pull request #1460 from ether/timeslider-labels 
timeslider label tests, fix and fix firefox page up down
 2013-02-06 15:43:54 -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 a9436f290a Merge pull request #1457 from ether/fix-IE8-error 
fixes IE8 error by only redifining if firefox
 2013-02-06 15:43:18 -08:00
John McLear 284748adb7 stop slider showing NaN on tiny pads 2013-02-06 23:35:58 +00:00
John McLear e4032f4d74 timeslider label tests 2013-02-06 23:28:46 +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
John McLear a5fb1e33de Merge pull request #1447 from jhollinger/develop 
Bugfixes to getChatHistory API method
 2013-02-04 07:07:47 -08:00
Jordan Hollinger 718421a46d Bugfixes to getChatHistory API method 2013-02-04 00:57:51 -05:00
John McLear de07d5a3e1 make plugin specs finally work 2013-02-04 00:03:25 +00: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
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