John McLear
63c65f784b
semi working example
2015-01-19 01:45:49 +00:00
John McLear
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
John McLear
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
Gared
018821e98c
Use camel case
2014-12-28 22:20:09 +01:00
Gared
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
John McLear
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
John McLear
555d22245d
Merge pull request #2335 from ether/javascript-bower
...
swap out jquery browser for bower but expose browser object to all pages...
2014-11-23 14:15:41 +00:00
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
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
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
0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
John McLear
0bea3a3af6
no image on timeslider
2014-11-18 21:13:21 +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
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
Prateek Saxena
ca32ac89b6
Add a subset of FontAwesome icons using Fontello
...
Most of the code here has been taken from @LaKing's #2554 .
Only icons required for etherpad have been added. Here is a
list of the code points that are being used:
0xe800 0xe801 0xe802 0xe803
0xe804 0xe805 0xe806 0xe807
0xe808 0xe809 0xe80a 0xe80b
0xe80c 0xe80d 0xe80e 0xe80f
0xe810 0xe811 0xe812 0xe813
0xe814 0xe815 0xe816 0xe817
Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css
Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.
This is the first step for #2253
2014-10-14 09:16:44 +05:30
0ip
12c1d3b05a
Fix active button ui
2014-10-03 17:35:48 +02:00
Marcel Klehr
6054cda473
Create a customizable timeslider toolbar
2014-03-30 13:02:41 +02:00
Marcel Klehr
867e40533a
Fix timeslider export dropdown
2014-03-30 12:30:18 +02:00
Marcel Klehr
a369347d86
Merge branch 'pr/1579' into toolbar-test
...
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
2014-03-16 13:30:22 +01:00
John McLear
24e96c4f8b
Merge pull request #2028 from webzwo0i/remove-deadcode
...
Remove deadcode
2013-12-09 10:49:57 -08:00
webzwo0i
4044d5ae47
remove hidden input field padId which is send on every import but not used
2013-12-08 17:14:01 +01:00
John McLear
98c4e32a14
Merge pull request #2026 from ether/afterEditHook
...
after Edit eejs block
2013-12-07 08:55:04 -08:00
Luc Didry
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear
749e557b84
after Edit eejs block
2013-12-04 23:17:32 +00:00
Eloy
de3a657c6b
Update pad.html
...
Select the URL when click at the text.
2013-12-02 16:43:52 +01:00
Marcel Klehr
7f10b9a42f
Add explanations for more disconnect scenarios
2013-10-10 21:11:15 +02:00
John McLear
e35c45e9b5
make export clearly seperated from import
2013-09-21 16:22:43 +01:00
Marcel Klehr
2b46bc40a1
Beautify infinite scroll
2013-09-12 16:37:37 +02:00
Wikinaut
4305bb16ed
utf-8 without BOM; removed trailing white spaces
2013-08-14 21:46:57 +02:00
Wikinaut
c3bffc2623
adding backlinks to main page in Admin pages; fix for https://github.com/ether/etherpad-lite/issues/1277
2013-08-14 21:42:59 +02:00
cohitre
90837437c5
Moving the toolbar plugin calls.
2013-04-13 12:06:51 -07:00
John McLear
9dfac79107
no need to declare var twice
2013-04-09 15:58:18 +01:00
John McLear
8836981e32
expose broadcast slider so plugins can interact with it
2013-04-09 15:55:14 +01:00
John McLear
6dc4ddd29e
no need for the language string on that div
2013-04-05 03:38:47 +01:00
John McLear
406ff8e6f8
Merge pull request #1681 from ether/loading_block
...
Loading blocks
2013-03-28 20:01:46 -07:00
John McLear
d73ea4e334
Loading blocks
2013-03-29 02:24:15 +00:00
John McLear
09b32ea694
Merge pull request #1672 from ether/feature/admin-plugins-revamp
...
/admin/plugins revamp
2013-03-27 12:05:00 -07:00
Marcel Klehr
bc8d6d4c45
/admin/plugins: Add a loading indicator to some messages
2013-03-27 12:20:50 +01:00
Marcel Klehr
c4d9a71156
/admin/plugins: Fix update check
2013-03-27 12:02:19 +01:00
Marcel Klehr
d01a209cbf
/admin/plugins: Dry up displaying of info messages
2013-03-26 21:04:21 +01:00
Marcel Klehr
2393dcd652
Disable search until registry is loaded and fix sorting by version
...
... and always display a scrollbar.
2013-03-26 19:22:04 +01:00
Marcel Klehr
7edfff7574
/admin/plugins: Show some text if nothing is display otherwise
2013-03-26 16:23:47 +01:00
Marcel Klehr
638cea5fd6
Install and uninstall plugins with style
...
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile
Why? http://i.imgur.com/XoX6uYS.jpg
2013-03-26 15:11:30 +01:00
Marcel Klehr
e8bae61cf5
/admin/plugins: Add progress indicators and report errors
2013-03-26 11:19:36 +01:00
Marcel Klehr
773293991b
admin/plugins: Allow people to sort search results
2013-03-25 23:09:03 +01:00
Marcel Klehr
079fdf0f38
Revamp /admin/plugins
...
- dry up the client-side code
- use the new saner API of pluginfw/installer.js on the server
- Improve UX: allow user to infinitely scroll to display their results
2013-03-25 17:20:10 +01:00
John McLear
2e7a9796de
option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title?
2013-03-24 01:12:01 +00:00
cohitre
988653b8ce
Toolbar hooks
2013-03-12 19:36:04 -07:00
