John McLear
|
85f18d1f92
|
no longer dep on npm as it's native
|
2013-02-10 03:39:20 +00:00 |
|
John McLear
|
f617cefe54
|
no need for jshint and update wd
|
2013-02-10 03:30:08 +00:00 |
|
John McLear
|
3a73aa2f48
|
please wait msg
|
2013-02-10 03:17:04 +00:00 |
|
John McLear
|
8f2025067b
|
remove one less warning during install by having a readme placeholder
|
2013-02-10 03:04:08 +00:00 |
|
John McLear
|
98d45af0f9
|
Merge pull request #1484 from disy-mk/develop
jquery update 1.7.1 -> 1.9.1
|
2013-02-09 18:18:40 -08:00 |
|
Manuel Knitza
|
98a9b1e222
|
update jquery 1.7.1 -> 1.9.1
|
2013-02-10 02:55:50 +01:00 |
|
Manuel Knitza
|
7b3d567d0c
|
.browser() support
Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)
|
2013-02-10 02:53:07 +01:00 |
|
John McLear
|
cd77f3e637
|
Merge pull request #1483 from 0ip/ua
Add UA functions
|
2013-02-09 17:47:34 -08:00 |
|
Manuel Knitza
|
7389e90cd0
|
update jquery 1.7.1 -> 1.9.1
|
2013-02-10 02:37:17 +01:00 |
|
0ip
|
c3a29d1480
|
Add missing export entry for the browser object
|
2013-02-09 22:35:10 +01:00 |
|
0ip
|
7ddfdc3935
|
Add UA functions
|
2013-02-09 22:26:47 +01:00 |
|
John McLear
|
56de6937e2
|
Merge pull request #1480 from 0ip/admin-ui
A few improvements to the admin dashboard
|
2013-02-09 12:43:49 -08:00 |
|
0ip
|
8a6b3c90e2
|
Fix loader styling
|
2013-02-09 21:29:11 +01:00 |
|
0ip
|
8fb8f0d3b6
|
Change settings layout
|
2013-02-09 21:22:23 +01:00 |
|
0ip
|
40734e6776
|
Fix table CSS
|
2013-02-09 20:58:57 +01:00 |
|
0ip
|
ad54369bf1
|
Add doctype
|
2013-02-09 20:57:41 +01:00 |
|
John McLear
|
a45a8a837d
|
stop opera doing stupid things
|
2013-02-09 19:44:13 +00:00 |
|
0ip
|
21e1422be6
|
Drop 'lite' occurrences in /admin/*
|
2013-02-09 20:42:47 +01:00 |
|
0ip
|
52ff28dea0
|
Fix data attribute
|
2013-02-09 20:34:12 +01:00 |
|
0ip
|
d2409288be
|
Add data-title for responsive tables
|
2013-02-09 20:15:41 +01:00 |
|
Marcel Klehr
|
43b2971a54
|
Merge pull request #1476 from ether/enable-timeslider-tests
Reenable timeslider revision test
|
2013-02-09 09:28:58 -08:00 |
|
John McLear
|
6651ed0b7a
|
allow all timeslider tests to run
|
2013-02-09 17:18:13 +00:00 |
|
John McLear
|
0bd86f1fe3
|
Merge pull request #1475 from ether/doc-fix-2
doh, doc fix
|
2013-02-09 09:03:59 -08:00 |
|
John McLear
|
280b3a404c
|
doh, doc fix
|
2013-02-09 17:02:54 +00:00 |
|
0ip
|
34fd7726bd
|
Fix :admin/index links
|
2013-02-09 17:55:11 +01:00 |
|
0ip
|
b04e99bddc
|
Tweak admin-UI
|
2013-02-09 17:54:39 +01:00 |
|
0ip
|
dd29096ad7
|
Normalize view-ports
|
2013-02-09 17:47:52 +01:00 |
|
John McLear
|
a93ff37879
|
fix opera by recreating a scheduler object
|
2013-02-09 16:42:47 +00:00 |
|
0ip
|
ef0a6ce5ff
|
Remove top-border
|
2013-02-09 17:39:08 +01:00 |
|
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 |