Commit graph

242 commits

Author SHA1 Message Date
0ip
8fb8f0d3b6 Change settings layout 2013-02-09 21:22:23 +01:00
0ip
40734e6776 Fix table CSS 2013-02-09 20:58:57 +01:00
0ip
b04e99bddc Tweak admin-UI 2013-02-09 17:54:39 +01:00
0ip
ef0a6ce5ff Remove top-border 2013-02-09 17:39:08 +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
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
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
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
Marcel Klehr
2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
Marcel Klehr
3719ce7c5d [admin] Make links prettier 2013-01-24 13:50:49 +01: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
730266256c fix #1341 by adding css to stop highlighting 2013-01-10 15:14:10 +00: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
0ip
8d0ef88baf Adjust select width
looks better :)
2012-12-05 12:55:48 +01: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
Iván Eixarch
657322db91 fixed git merge confict 2012-12-03 01:39:59 +01:00
John McLear
a74defdab7 Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:07:23 +00: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
c445197e7f Update src/static/css/pad.css 2012-11-27 15:10:36 +00:00
John McLear
f880473360 remember the styling for the pasword prompt 2012-11-26 20:54:28 +00:00
Wikinaut
a49bab5dae fix timeslider rightstep button position 2012-11-26 08:54:13 +01:00
Iván Eixarch
d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
0ip
6b6315ca3c Tidy up settings 2012-11-14 14:26:49 +01:00
0ip
b28afe4c47 Adjust border-color of #sidediv 2012-11-13 12:42:52 +01:00
John McLear
7febd3ff5c Resolve #583
This kinda resolves the issue but not in a very graceful way.  It means any numbered items > 99 will still be cropped.

The problem is due to no padding/margin and then needing to specify margin.

you can replicate this bug with

```
<body style="padding:0; margin:0">
<style type="text/css">
li:nth-child(n+10){
  margin-left:1.6em;
}
</style>
<ol style="list-style-type: decimal;margin-left:1.5em;padding:0;">
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>
  <li>
  1
  </li>




</ol>
</body>
```
2012-11-06 12:37:35 +00:00
johnyma22
1d055f2cd4 make stuff work 2012-11-02 15:15:13 +00:00
johnyma22
f6fa897a4e actually using text area is a lot less stupid 2012-11-02 14:31:52 +00:00
johnyma22
89e38ed4c2 Start putting file system together for admin settings, no where near complete 2012-11-02 13:16:15 +00:00
johnyma22
d30bb6d892 fixes a tiny css bug #1077 2012-10-30 21:57:15 +00:00
johnyma22
4f85bf09cc make anything less than 400px span 2 lines on toolbar and make popups appear below this 2012-10-29 19:20:02 +00:00
Marcel Klehr
eb6be84150 Fix html/css 2012-07-15 16:03:12 +02:00
Marcel Klehr
4901adeac7 Fix timeslider. 2012-07-14 15:54:44 +02:00
Marcel Klehr
1466fa03a4 Fix some minor mistakes. 2012-07-14 15:54:20 +02:00
Marcel Klehr
8ab12ee69e Only disable toolbar.
Make content available and allow scrolling
2012-07-14 14:46:02 +02:00
Marcel Klehr
6da6a7f0d8 Use nice editbar popups for connection status instead of srceen-blocking modals. 2012-07-13 08:23:22 +02:00
Egil Moeller
15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
2012-05-29 21:26:12 +02:00
0ip
d4b4ca0a5c Center user icon and fix overlapping chat 2012-05-23 20:40:24 +03:00
0ip
185a3bface Add def. bg to <select> and remove useless style 2012-05-20 20:19:16 +03:00
0ip
fe0ea23299 Fix userlist now showing up 2012-05-20 16:02:51 +02:00
0ip
caa56dd32a Add non-floating popups 2012-05-20 15:59:51 +02:00
0ip
19cf43d0a3 Style select (useful for plugins) 2012-05-20 15:38:12 +02:00
0ip
750b9d44df Style selected text 2012-05-20 15:37:03 +02:00
0ip
fbee7dabcf Add grouped buttons 2012-05-20 15:29:10 +02:00
0ip
afe060e2b8 Remove even more old code 2012-05-20 14:53:30 +02:00
0ip
0d68cd23ba Remove old CSS code 2012-05-20 14:48:02 +02:00
John McLear
fbc2cb32b3 Merge pull request #705 from johnyma22/removeWordle
Remove wordle
2012-05-19 05:58:38 -07:00
John McLear
53bfc380af Merge pull request #703 from cweider/remove-onclick
Remove onclick
2012-05-19 05:41:49 -07:00
Egil Moeller
fc946ffc33 Hide editing buttons when in readonly mode 2012-05-17 12:03:38 +02:00
Chad Weider
9942c577dc Patch tablet styling. 2012-05-13 15:33:22 -07:00
Chad Weider
5d0c853889 Remove unnecessary styles. 2012-05-13 15:33:22 -07:00
Chad Weider
f802a79da6 Make styles less restrictive. 2012-05-13 15:33:22 -07:00
Chad Weider
818c3ef40d Shift button appearance onto anchor. 2012-05-13 15:33:22 -07:00
Chad Weider
089e0227fd Shift editbar styles around. 2012-05-13 15:33:22 -07:00
Chad Weider
1ea889bfab Anchors are not icons 2012-05-13 15:33:22 -07:00
Chad Weider
ab8b2cae21 Remove nonsense styles. 2012-05-13 15:33:22 -07:00
John McLear
def904dbed remove wordle 2012-05-13 20:20:18 +01:00
John McLear
c70d88eedc Merge pull request #667 from fourplusone/feature/cleaner_code
Removing unused code - All looks good, some minor tweeks are probably worthwhile  in the future.
2012-05-13 06:51:58 -07:00
0ip
64db697558 Fixed typos 2012-04-30 16:54:19 +02:00
0ip
23cdb2a5c6 Removed QR-Code 2012-04-30 15:54:21 +02:00
0ip
96eb8ac004 100% is not needed here http://ragefac.es/416 2012-04-29 21:19:34 +03:00
0ip
2525f20ff4 Tidied up highlighting for currently opened module 2 2012-04-29 02:48:47 +02:00
0ip
4b272fe2e1 Tidied up highlighting for currently opened module 2012-04-29 01:00:31 +02:00
Matthias Bartelmeß
07ee836946 set view zoom is unused 2012-04-20 12:19:09 +02:00
Matthias Bartelmeß
e661f653b1 sharebox and Feedback are not used. Removing them 2012-04-20 12:15:09 +02:00
0ip
ef88d2798e Restore overwritten plugin manager UI 2012-04-19 17:00:29 +02:00
Egil Moeller
f80f9fc59f Merge commit 'd5120c9' into pita 2012-04-17 22:34:45 +02:00
0ip
8fa54e2402 admin interface styling and sensibility 2012-04-11 19:44:18 +02:00
0ip
50c79df272 prefixed css files containing css3 attributes due to recently removed prefixfree.js 2012-04-09 17:52:43 +02:00
John McLear
f9d8cea114 Merge pull request #612 from levu42/bug-user-scroll
Userlists now scrolls if there are too many users
2012-04-09 06:37:03 -07:00
0ip
c3095bbd1b improved userlist ux (prevent overlapping of objects) 2012-04-09 15:16:40 +02:00
levu
9e063341ce fix for bug 'userlist not scrolling' 2012-04-08 16:22:00 +02:00
Matthias Bartelmeß
151f1a0d71 Merge branch 'develop' into timeslider_authors 2012-04-05 21:54:26 +02:00
Matthias Bartelmeß
404ce9e452 css fixes 2012-04-05 21:53:04 +02:00
Matthias Bartelmeß
9e042ee942 Merge branch 'develop' into timeslider_authors
Conflicts:
	src/static/css/pad.css
	src/templates/timeslider.html
2012-04-05 21:47:59 +02:00
johnyma22
d5120c98d0 very quick admin interface styling and sensibility 2012-04-05 18:22:53 +01:00
johnyma22
66fdacf9cf move css out of html 2012-04-05 18:04:17 +01:00
Egil Moeller
ba00144bcd Button styling bugfix 2012-04-01 15:20:51 +02:00
Egil Moeller
08cc3e128f Bugfix for timeslider styling 2012-04-01 14:33:39 +02:00
Egil Moeller
33c53e61c2 Merge branch 'johnyma22'
Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html
2012-04-01 13:27:38 +02:00
Egil Moeller
b74447aa3c Styling generalization - use classes instead of id:s where applicable 2012-03-28 19:20:07 +02:00
Matthias Bartelmeß
e463273901 added UI to for unnamed authors 2012-03-25 15:48:31 +02:00
Matthias Bartelmeß
94a9795a04 CSS candy 2012-03-25 00:29:03 +01:00
Matthias Bartelmeß
371aee2e19 Added timeslider author UI 2012-03-24 20:35:45 +01:00
Egil Moeller
ce5d2d8685 Merge branch 'pita'
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
2012-03-02 22:00:20 +01:00
Egil Moeller
1239ce7f28 The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00