mluto
|
7432b7aff9
|
Rewrote getParams() to be more dynamic and shorter
|
2013-01-27 11:02:15 +01:00 |
|
John McLear
|
77403942ee
|
fix make file issue
|
2013-01-27 03:08:21 +00:00 |
|
John McLear
|
e811037300
|
Merge pull request #1411 from ether/feature/plugin-update-checker
plugin update checker
|
2013-01-26 13:36:11 -08:00 |
|
Marcel Klehr
|
541aeb3a98
|
/admin/plugins: Display an update button for all plugins that are outdated
|
2013-01-26 22:15:19 +01:00 |
|
Marcel Klehr
|
0549a4fec7
|
Add checkUpdates endpoinnt for /admin/plugins
|
2013-01-26 22:13:28 +01:00 |
|
John McLear
|
4dab76f78a
|
Merge pull request #1410 from ether/admin-css-fix
Admin css fix
|
2013-01-26 12:07:42 -08:00 |
|
John McLear
|
1290fa36c3
|
typo fix
|
2013-01-26 20:05:37 +00:00 |
|
John McLear
|
9d0672c1c8
|
not a perfect css fix but stops the overflow when screen is less than 1000px
|
2013-01-26 20:04:33 +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 |
|
John McLear
|
51daaf02ce
|
Merge pull request #1407 from mluto/hardcoded-i18n
i10ze hardcoded message, update some messages on lang-change
|
2013-01-26 07:19:04 -08:00 |
|
John McLear
|
994366750f
|
Merge pull request #1408 from mluto/chat-api
Added API-Endpoints for chat
|
2013-01-26 07:15:24 -08:00 |
|
mluto
|
cb2b93b133
|
Added getChatHistory and getChatHead (api+code+doc)
|
2013-01-26 14:35:26 +01:00 |
|
mluto
|
046fac9fa9
|
Added a comment to clearify *why* this works
|
2013-01-25 20:38:24 +01:00 |
|
mluto
|
763864539f
|
Use 'html10n' instead of '_', i10nzed "unnamed author(s)"
|
2013-01-25 17:41:33 +01: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
|
cf1bba8e65
|
Merge pull request #1406 from mluto/fix-en-json
Re-Formatted en.json
|
2013-01-25 08:11:56 -08:00 |
|
mluto
|
509f564cd7
|
re-formated onelined en.json
|
2013-01-25 17:06:57 +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
|
82e681fb14
|
Update settings.json.template
|
2013-01-24 22:39:32 +00: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
|
23dd4c73e2
|
pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message
|
2013-01-24 22:40:31 +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
|
19e112f160
|
Merge pull request #1403 from ether/index-wrapper-block
index wrapper block
|
2013-01-24 13:37:00 -08:00 |
|
John McLear
|
1f7140345a
|
index wrapper block
|
2013-01-24 20:03:07 +00:00 |
|
John McLear
|
ccc06b08ee
|
Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu
Add a unified menu to all admin pages
|
2013-01-24 10:00:58 -08: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 |
|
Marcel Klehr
|
0c3d90b753
|
Merge pull request #1401 from ether/slider-position
Fix #1360 -- slider pin position
|
2013-01-24 09:00:46 -08:00 |
|
John McLear
|
569fb8d3c8
|
silly little bug now resolved
|
2013-01-24 16:48:40 +00:00 |
|
John McLear
|
18b96b33c6
|
Merge pull request #1379 from ether/more-plugin-details
resolve #1349 - add url to plugin name
|
2013-01-24 07:29:30 -08:00 |
|
Marcel Klehr
|
3719ce7c5d
|
[admin] Make links prettier
|
2013-01-24 13:50:49 +01:00 |
|
Marcel Klehr
|
9fa5b9506e
|
Add links for installed plugins
|
2013-01-24 13:43:42 +01:00 |
|
John McLear
|
28aa1ecc24
|
Merge pull request #1398 from marcelklehr/fix/html10n-ie8-array.indexOf
Fix Array.prototype.indexOf for IE8! <3
|
2013-01-23 08:49:15 -08:00 |
|
Marcel Klehr
|
25e1ed2d0c
|
Fix Array.prototype.indexOf for IE8! <3
|
2013-01-23 17:40:10 +01:00 |
|
John McLear
|
c632e3d379
|
Merge pull request #1396 from goldquest/dev_importfix
use the existing padimpexp object from the parent window, Issue #1395
|
2013-01-23 08:03:08 -08:00 |
|
goldquest
|
74185e79ab
|
use the existing padimpexp object from the parent window
|
2013-01-23 16:36:37 +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 |
|
John McLear
|
f1b9c213ee
|
and semi working
|
2013-01-22 23:37:53 +00:00 |
|
John McLear
|
3fb2f02875
|
semi working
|
2013-01-22 23:16:49 +00:00 |
|
John McLear
|
d21585b880
|
mheh
|
2013-01-22 23:06:52 +00:00 |
|
John McLear
|
205d983225
|
make it crash
|
2013-01-22 22:48:05 +00:00 |
|
John McLear
|
5d416579ee
|
bring in some padDiff stuff that doesnt suck
|
2013-01-22 22:33:51 +00:00 |
|
John McLear
|
6ae46ea8e3
|
fix issue where url was wrong for install
|
2013-01-22 18:28:38 +00:00 |
|
John McLear
|
557b5c1ad0
|
Merge pull request #1388 from ether/proper-fix-for-import-url
fix import without params
|
2013-01-22 10:20:20 -08:00 |
|
John McLear
|
159feceb20
|
fix import without params
|
2013-01-22 18:17:15 +00:00 |
|
John McLear
|
c6882aa65a
|
Merge pull request #1386 from ether/fix-import-on-params
fix issue #1369 where params would break import
|
2013-01-22 08:05:04 -08:00 |