Commit graph

2214 commits

Author SHA1 Message Date
Mike Brousseau
34594eb88b Update src/static/js/pad.js
Check if the browser is IE and if so output the entire path via document.location over document.location.pathname to the cookie creation in createCookie()
2012-11-08 13:47:21 -05:00
John McLear
745a1860ac Merge pull request #1145 from marcelklehr/fix/contributing-md
Try to clean up CONTRIBUTING.md
2012-11-08 08:52:44 -08:00
Marcel Klehr
545026affa Try to clean up CONTRIBUTING.md
and make things clearer
2012-11-08 17:50:17 +01:00
John McLear
8bb8e484ee Merge pull request #1135 from marcelklehr/fix/server-restart-settings-reload
/admin/settings: reload settings on server restart
2012-11-08 08:33:56 -08:00
John McLear
9f76d24646 Merge pull request #1143 from JasonWoof/fix-linux-install-instructions
fix typo in Linux install instructions
2012-11-08 06:15:40 -08:00
Jason Woofenden
01727d1542 fix typo in Linux install instructions 2012-11-07 23:31:24 -05:00
John McLear
e1edc8079f Merge pull request #1138 from btherres/develop
fix installDeps.sh for solaris compatibility
2012-11-07 04:13:25 -08:00
Bastian
05f96429ef added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag 2012-11-07 12:51:51 +01:00
John McLear
6148548e00 Fix unclickable / broken links to IRC webchat 2012-11-07 11:10:36 +01:00
Marcel Klehr
d26f5d64f7 Fix #1130 Reload settings on /admin/settings server restart 2012-11-06 17:35:52 +01:00
Marcel Klehr
e702a86c9f Add ability to reload settings 2012-11-06 17:35:05 +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
John McLear
04166f4fbc Merge pull request #1134 from Pita/resize-settings-textarea
resolve #1131 make textarea resize
2012-11-06 03:59:22 -08: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
051927cbc8 Merge pull request #1126 from Pita/remove-available-plugins-folder
@redhog said its okay to remove this folder as it serves no purpose
2012-11-05 04:49:09 -08: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
John McLear
dfa0ae9181 Merge pull request #893 from marcelklehr/feature/plugin-settings
Add a new section in settings.json specifically for installed plugins.
2012-11-05 04:48:47 -08:00
John McLear
b6b99f7389 @redhog said its okay to remove this folder as it serves no purpose 2012-11-05 12:44:05 +00:00
Wikinaut
a575de7884 allow favicon.ico as pad name 2012-11-04 13:02:55 +01:00
Wikinaut
c92b5283fd fix #377: add favicon url as optional settings.json parameter 2012-11-04 11:26:17 +01:00
Peter 'Pita' Martischka
d122e28232 Fixed clear authorship test in IE 10 2012-11-04 00:25:54 +00:00
Peter 'Pita' Martischka
1e27fa1475 rewrote change user name tests to do what John probably wanted to do 2012-11-03 23:52:17 +00:00
Peter 'Pita' Martischka
cd368b5f8e Various improvments of the helper 2012-11-03 23:48:10 +00:00
Peter 'Pita' Martischka
ebef2d2141 deactivated the timeslider test for now 2012-11-03 22:37:25 +00:00
Peter 'Pita' Martischka
922e47f8bd Fixed change user name test 2012-11-03 22:36:36 +00:00
Peter 'Pita' Martischka
f30300d6fd Fixed helper waitFor test 2012-11-03 22:20:27 +00:00
Peter 'Pita' Martischka
4944dcbd1c fixed change user name test 2012-11-03 22:16:44 +00:00
Peter 'Pita' Martischka
c5b68bb6ca Fixed clear authorship test 2012-11-03 22:02:09 +00:00
Peter 'Pita' Martischka
23e5c952d8 bump travis 2012-11-03 18:19:26 +00:00
Peter 'Pita' Martischka
6408581adb merged develop back in 2012-11-03 18:16:36 +00:00
Peter 'Pita' Martischka
ba1115376f split long log lines 2012-11-03 18:14:54 +00:00
Marcel Klehr
0fa25264bc Merge pull request #1119 from clkao/import-ol
Import <ol>'s  as <ol>'s and not as <ul>'s!
2012-11-03 11:11:34 -07:00
Peter 'Pita' Martischka
08a2d28a99 build sauce url after session got initalized 2012-11-03 18:09:58 +00:00
Peter 'Pita' Martischka
801ed8646b output sauce test url 2012-11-03 17:51:01 +00:00
Peter 'Pita' Martischka
8d6dbd2bf6 Make sauce sessions public 2012-11-03 17:46:02 +00:00
Peter 'Pita' Martischka
a5870b94df on error logging didn't work really well 2012-11-03 17:26:55 +00:00
Peter 'Pita' Martischka
c99a256acd Download sauce connect from google drive, thats much faster 2012-11-03 17:10:37 +00:00
Peter 'Pita' Martischka
3ee4fadf8a workaround for IE8's stupidness, use a \n for new lines 2012-11-03 17:02:28 +00:00
Peter 'Pita' Martischka
7aae29114b kill hanging tests 2012-11-03 16:51:37 +00:00
Peter 'Pita' Martischka
95f17d490d typo 2012-11-03 16:50:48 +00:00
Peter 'Pita' Martischka
600d428ec2 I'm so stupid... 2012-11-03 16:21:28 +00:00
Peter 'Pita' Martischka
401243e9b0 Don't test with browsers with very low usage 2012-11-03 16:20:05 +00:00
Peter 'Pita' Martischka
ecdd39bca6 Let's try 5 tests in parrallel 2012-11-03 16:11:41 +00:00
Peter 'Pita' Martischka
5e90db6487 another typo 2012-11-03 16:11:15 +00:00
Peter 'Pita' Martischka
ac3ff4f66d Only test in node.js 0.8 2012-11-03 16:07:32 +00:00
Peter 'Pita' Martischka
4e4c720cb0 fixed type 2012-11-03 16:05:12 +00:00