libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 22:49:53 +01:00
Code Issues Projects Releases Wiki Activity
6513 commits 207 branches 105 tags 123 MiB
Commit graph

355 commits

Author SHA1 Message Date
John McLear
7b726cbc02 more working logic and also pretty nice screen reader experience 2015-03-26 13:58:57 +00:00
John McLear
4362a42f7f make index page accessible for screen readers 2015-03-26 11:38:55 +00:00
John McLear
b72127c327 different font families for people with dyslexia 2015-03-25 12:24:20 +00:00
John McLear
d0caebc21f may aswell make the git sha a link to the commit 2015-02-11 18:05:01 +00:00
John McLear
ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00
Stefan
713b369fc3 Add 'last update' column to plugins table 2015-01-24 12:49:17 +01:00
John McLear
aee0fd797d working translation 2015-01-21 16:11:00 +00:00
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
cohitre
292a3bd7b7 Setting up the right toolbar. 2013-03-09 14:57:42 -08:00
Marcel Klehr
760e1b82c3 Add a setting for RTL text direction (integrating the url paramter) 
Fixes #1191
 2013-03-05 23:12:00 +01:00
cohitre
c57bc444cd basic toolbar setup 2013-03-03 16:06:14 -08:00
John McLear
f915285f15 merge develop 2013-02-25 10:13:50 +00:00
John McLear
cda3a0e78b a different approach 2013-02-18 21:03:52 +00:00
John McLear
3f87a32a12 timestlider script block 2013-02-18 18:07:01 +00: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
ad54369bf1 Add doctype 2013-02-09 20:57:41 +01: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
0ip
34fd7726bd Fix :admin/index links 2013-02-09 17:55:11 +01:00
0ip
dd29096ad7 Normalize view-ports 2013-02-09 17:47:52 +01:00
0ip
ef0a6ce5ff Remove top-border 2013-02-09 17:39:08 +01:00
root
9fcabfa8ac fix IE8 styling y u no do this 0ip? 2013-02-06 20:02:24 +00:00
Swen
360d5c150b Update html code to proper validate 2013-01-30 20:24:48 +01:00
Swen
1f348d911f Merge branch 'develop' into admin-index-plugable 2013-01-30 20:16:51 +01:00
John McLear
1c7810783c gritter now implemented 2013-01-29 01:55:36 +00:00
spcsser
80333d8e0a Added ability to add menu entries for admin pages. 2013-01-27 23:02:27 +01:00
John McLear
090508909e Merge pull request #1389 from ether/disconnect-eejs-block 
add eejs block for disconnect
 2013-01-26 09:06:53 -08:00
John McLear
0ccd1a30e9 Merge pull request #1390 from ether/html-head-block-eejs 
add a html block eejs so you can add a cache manifest
 2013-01-26 09:06:38 -08:00
mluto
4a20a26cbf Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n 2013-01-25 17:14:56 +01:00
Marcel Klehr
2841bfc009 Merge branch 'feature/real-time-plugin-search' into develop 2013-01-25 14:50:51 +01:00
mluto
7812d93e74 Fixed "unnamed" and "enter your name" in userlist 2013-01-25 10:32:09 +01:00
John McLear
568b641ee9 Merge pull request #1404 from ether/feature/real-time-plugin-search 
real-time plugin search
 2013-01-24 14:09:30 -08:00
Marcel Klehr
3e793b8a63 [/admin/plugins] remove progress history 2013-01-24 23:00:56 +01:00
Marcel Klehr
fa55cd4759 [/admin/plugins] Add real-time on keypress search 
also, I reduced the size of the activity indicator
 2013-01-24 22:39:52 +01:00
John McLear
1f7140345a index wrapper block 2013-01-24 20:03:07 +00:00
Marcel Klehr
7c06dc750c Unify admin page titles 2013-01-24 18:46:32 +01:00
Marcel Klehr
2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
John McLear
9129c6970a add a html block eejs so you can add a cache manifest 2013-01-23 02:46:57 +00:00
John McLear
b76f084f3a add eejs block for disconnect 2013-01-23 01:01:35 +00:00
mluto
9c364d7d38 Added a template block for #users 2013-01-20 13:56:51 +01:00
John McLear
1e7bcdba59 more sensible timeslider blocks.. 2013-01-14 03:42:09 +00:00
John McLear
33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages 
Load more than 100 chat messages using a 'load more'-link
 2013-01-13 10:31:45 -08:00
John McLear
0bcfef5aa4 Merge pull request #1352 from ether/timeslider-eejs 
add a body eejs block to timeslider
 2013-01-13 10:27:50 -08:00
John McLear
eb0338d40c better shindig 2013-01-13 18:23:35 +00:00
John McLear
e137919c3d add a body eejs block to timeslider 2013-01-12 23:51:35 +00:00
0ip
2786807f2f Fix broken relative paths 
Bug introduced in 53521c8732
 2013-01-12 18:41:56 +01:00
mluto
bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto
5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES 2013-01-07 17:36:03 +01:00
mluto
77315aa1d4 Load CSS before JS, in timeslider 2013-01-06 12:26:00 +01:00
mluto
c56c7b8ca9 Load CSS before JS 
According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
 2013-01-06 12:19:56 +01:00
Marcel Klehr
fdf6628cc5 Fix html attr translation 2012-12-23 18:17:23 +01:00
Marcel Klehr
4a489f85f6 Fix translations in timeslider template 2012-12-23 18:17:08 +01:00
Marcel Klehr
67c893aaca Fix html10n and the locale resource <link>s 2012-12-23 18:16:39 +01:00
Marcel Klehr
53521c8732 Replace webL10n with html10n.js 2012-12-23 18:16:13 +01:00
Iván Eixarch
ff8b4b6b20 change key of message sucessfull on import 2012-12-09 17:34:32 +01:00
Iván Eixarch
0371d5ba9e Remove async load of l10n.js because Chrome fail to translate 2012-12-09 09:41:30 +01:00
Marcel Klehr
b5af643969 Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-size 
Reduce the file input's width in the import popup to prevent overflow
 2012-12-05 06:14:05 -08:00
Guillaume AMAT
c853f8fad2 Reduces the width of the file input to prevent overflow in the import popup 2012-12-05 15:02:32 +01:00
Marcel Klehr
fe89a367cc Fix #1226: Chrome would load async js 2012-12-05 14:16:44 +01:00
0ip
1fc5519c86 Display plugin versions 2012-12-04 14:30:30 +01:00
John McLear
b3e55f64a8 stop password being clearly visible 2012-12-03 13:10:32 +00:00
John McLear
bef25b40f8 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-03 11:37:01 +00:00
root
84d154b168 Update strings, add UK strings, fix JS 2012-12-03 11:35:06 +00:00
Iván Eixarch
657322db91 fixed git merge confict 2012-12-03 01:39:59 +01:00
John McLear
c9a5e55654 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:06:33 +00:00
root
3cdf66c2f7 first effort to move into templates but javascript is broken so dont pull 2012-12-02 17:03:56 +00:00
John McLear
d761003588 fix path to favicon resolves #1236 2012-11-30 22:50:54 +00:00
Iván Eixarch
d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
Iván Eixarch
6d5907562d Fixed installed plugins section in plugins/info 2012-11-24 03:18:22 +01:00
Iván Eixarch
8ac49477f9 Fix 1203: non-escaped html in plugins info 2012-11-24 00:42:44 +01:00
Iván Eixarch
1e71797ad5 Replace Globalize with languages module 2012-11-20 19:46:17 +01:00
Marcel Klehr
5baef07b55 Load l10n.js first but asynchronusly 2012-11-17 15:28:33 +01:00
Sarhan Aissi
716aa13a79 Fix examples url in settings.html to use ether/ 2012-11-16 10:39:38 +01:00
John McLear
68b1d78f32 Merge pull request #1159 from marcelklehr/fix/lang-autodetection 
Fix language auto-detection
 2012-11-14 10:58:07 -08:00
Marcel Klehr
b416402f10 Fix language auto-detection 2012-11-14 19:38:35 +01:00
0ip
dcff0d74ef Fix Timeslider translation not showing up 2012-11-14 19:31:09 +01:00
Marcel Klehr
f5563ab704 Move locale detection to the client 
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
 2012-11-14 17:01:59 +01:00
Marcel Klehr
ffb7cf47f2 Mate timslider page title translateable 2012-11-14 15:31:43 +01:00
0ip
6b6315ca3c Tidy up settings 2012-11-14 14:26:49 +01:00
John McLear
838a1e3d69 just export on timeslider, no import.. 2012-11-14 09:31:27 +00:00
John McLear
0e6a701f92 Update src/templates/timeslider.html 2012-11-14 09:20:16 +00:00
Peter 'Pita' Martischka
6de7634357 merged develop back in 2012-11-13 07:43:48 -08:00
Peter 'Pita' Martischka
4c095202bd Merged branch feature/frontend-tests 2012-11-13 07:29:57 -08:00
Marcel Klehr
19c12239f6 Simplify lang setting in pad.html template 2012-11-12 18:04:21 +01:00
Marcel Klehr
ed3020c729 Translate timeslider export links 2012-11-12 17:34:29 +01:00
Marcel Klehr
378a74fb4e Remove translated strings from template files 2012-11-12 17:24:14 +01:00
Marcel Klehr
7021a8b885 Add pad setting for UI lang 2012-11-12 16:49:15 +01:00
Marcel Klehr
e5d1c6b279 Allow translation of pad.html 2012-11-10 14:13:10 +01:00
Marcel Klehr
145e893273 Allow translations for index.html 2012-11-10 14:12:58 +01:00
John McLear
f68bdde0c1 resolve #1131 make textarea resize 2012-11-06 11:56:19 +00:00
John McLear
28bcdcec25 Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter 
fix #377: add favicon url as optional settings.json parameter
 2012-11-06 03:08:25 -08:00
John McLear
6f1bab5faf correct links to example settings.json files 2012-11-05 13:16:07 +00:00
John McLear
b9541f938b Merge pull request #1127 from Pita/admin-page 
add express endpoint for admin index.html
 2012-11-05 04:59:01 -08:00
John McLear
3766858dd2 add express endpoint for admin index.html 2012-11-05 12:58:02 +00:00
John McLear
b6a331b9ec Merge pull request #1120 from Pita/feature/settings-admin 
Modify Server Settings in /admin/settings
 2012-11-05 04:48:59 -08:00
Wikinaut
c92b5283fd fix #377: add favicon url as optional settings.json parameter 2012-11-04 11:26:17 +01:00
Peter 'Pita' Martischka
6408581adb merged develop back in 2012-11-03 18:16:36 +00:00
johnyma22
1d055f2cd4 make stuff work 2012-11-02 15:15:13 +00:00
johnyma22
7fa5dd757e remove cruft from js and move minify json to seperate file and also send emit back to server on save settings 2012-11-02 15:05:47 +00:00