Commit graph

183 commits

Author SHA1 Message Date
cohitre
90837437c5 Moving the toolbar plugin calls. 2013-04-13 12:06:51 -07: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
cohitre
c57bc444cd basic toolbar setup 2013-03-03 16:06:14 -08:00
John McLear
1c7810783c gritter now implemented 2013-01-29 01:55:36 +00: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