John McLear
9b66c93d6b
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
2014-11-22 19:11:35 +00:00
John McLear
764b8af5e3
Merge pull request #2334 from luto/api-mystery-crash
...
fix api mystery crash
2014-11-22 15:50:23 +00:00
luto
4eee89ad12
fix api mystery crash
2014-11-22 16:46:37 +01:00
John McLear
1ed12c6555
Merge pull request #2333 from l-y-n-x/admin_path
...
Changed relative path to Etherpad main page in admin settings.
2014-11-22 13:31:09 +00:00
l-y-n-x
4e31ec8ab9
Changed relative path to Etherpad main page in admin settings.
...
There was one '../' too much.
2014-11-22 10:24:30 +01:00
Timothy Chavez
25ccb6cfc3
Simplify the rebuild process
...
The majority of the information needed to build the new pad can be
communicated by simply cloning the rev using a db.set().
2014-11-20 22:09:21 -06:00
John McLear
488d6890f9
minor styling
2014-11-21 00:15:55 +00:00
John McLear
703440acd7
missing socketio fix
2014-11-21 00:11:50 +00:00
John McLear
d3ad62bf2d
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-20 02:23:34 +00:00
Timothy Chavez
01f6d85371
Restore pad to new location at a given revision
...
This script gives an admin with shell access the ability to restore a
pad at a given revision by essentially rebuilding it at a new location
with data associated with the original pad. The upsides to creating a
new pad vs. changing the original are: 1) avoiding service disruptions
(no deletes, no moving targets - builds from previous revision); and 2)
preservation of data (no deletes, no overwriting of the source pad).
The most obvious downside is the pad has a new ID which could require
folks to update their links, bookmarks, etc. to point at the new
location.
2014-11-19 13:09:37 -06:00
John McLear
ff9a2a687f
whoops fix animation not to look broken
2014-11-19 18:27:55 +00:00
John McLear
da824de5f1
Merge pull request #2321 from ether/new-icons
...
Remove all images, include new icons for plugins
2014-11-19 18:06:49 +00:00
John McLear
28c7b666c1
correct file links
2014-11-19 00:24:14 +00:00
John McLear
16d8068d7d
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
2014-11-19 00:17:01 +00:00
John McLear
9aea689438
move tiny bit of font awesome we actually use into pad.css
2014-11-19 00:16:08 +00:00
John McLear
7b9fd81284
Merge pull request #2326 from ether/blocks-for-custom-script-and-styles
...
working blocks
2014-11-18 23:51:46 +00:00
John McLear
0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
John McLear
f5dcc374ba
slight ui fix
2014-11-18 23:15:56 +00:00
John McLear
e821cb13fa
more polish
2014-11-18 22:47:20 +00:00
John McLear
95cb721914
clean up
2014-11-18 22:41:00 +00:00
John McLear
09b08e5a72
working pause
2014-11-18 22:29:46 +00:00
John McLear
e2410e41b0
more polish
2014-11-18 22:24:16 +00:00
John McLear
a06f01c04a
some timeslider styling but this wont be completed by me
2014-11-18 22:21:36 +00:00
John McLear
17f6a225c1
Merge pull request #2324 from beaugunderson/no-crash-on-parse-plugins
...
Don't crash on bad plugins.json; fixes #2323
2014-11-18 22:16:33 +00:00
Beau Gunderson
645ec830b0
Don't crash on bad plugins.json; fixes #2323
2014-11-18 13:59:36 -08:00
John McLear
0bea3a3af6
no image on timeslider
2014-11-18 21:13:21 +00:00
John McLear
4a12eec3e0
a font lookup file
2014-11-18 21:10:40 +00:00
John McLear
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +00:00
John McLear
9b5ee93bce
spinning loading icons
2014-11-18 19:13:51 +00:00
John McLear
3ad9a58895
fontello config file
2014-11-18 18:47:12 +00:00
John McLear
21ce9b4dd3
correct font stuff
2014-11-18 18:44:45 +00:00
John McLear
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
John McLear
3e8f3cd938
hrm I dont trust this security
2014-11-18 14:56:40 +00:00
John McLear
ff603d7b58
stability restored now to handle the auth issues
2014-11-18 14:12:02 +00:00
John McLear
d10013c159
client side code now fixed
2014-11-18 14:10:38 +00:00
John McLear
020b636b1f
template of a semi-fix
2014-11-18 14:08:44 +00:00
Marcel Klehr
135aa3e8fe
Merge pull request #1783 from simong/removed-console-in-html10n
...
Removed console wrapping in html10n as it's breaking in PhantomJS.
2014-11-15 18:08:53 +01:00
Simon Gaeremynck
d7a181be67
Nooping console.foo in html10n.js when the method is not defined.
2014-11-15 16:31:19 +00:00
John McLear
865829e159
Merge pull request #1682 from luto/fix-listSessionsOfGroup
...
Don't error in listSessionsOfGroup when there are non-existing sessions
2014-11-15 16:25:23 +00:00
John McLear
fc79c8a298
Merge pull request #1912 from ether/hide-chat-when-caret-behind
...
Hide Chat Icon when the Caret is on the same line
2014-11-15 16:13:53 +00:00
John McLear
77c805a2bf
Merge branch 'master' of github.com:ether/etherpad-lite into develop
2014-11-15 16:01:03 +00:00
John McLear
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
John McLear
f5fbcbbc81
Merge pull request #2273 from ether/bump-swagger
...
Bumps version # to remove legacy ERRORS on pad access in latest versions of node
2014-11-15 15:39:55 +00:00
John McLear
4986dd11ee
merging
2014-11-15 15:39:46 +00:00
John McLear
9c935a6997
Merge pull request #2285 from talexand/develop
...
Added explicit reference to plugins and themes in readme
2014-11-15 15:38:18 +00:00
John McLear
eff4863a22
Merge pull request #2290 from ether/IE11-null-password
...
change to proper IE check
2014-11-15 15:37:53 +00:00
John McLear
12914e68ff
Merge pull request #2294 from ether/go-away-npm
...
Use request and a remote ep plugin only endpoint
2014-11-15 15:37:44 +00:00
John McLear
8d2fa35b3f
Merge pull request #2298 from ether/reflow-toolbar-properly
...
Reflow toolbar properly
2014-11-15 15:37:28 +00:00
John McLear
ab4819fb85
Merge pull request #2296 from ether/new-express
...
New express
2014-11-15 15:36:52 +00:00
John McLear
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
