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-02-08 03:02:03 +01:00
Code Issues Projects Releases Wiki Activity
2228 commits 208 branches 105 tags 125 MiB
Commit graph

656 commits

Author SHA1 Message Date
Marcel Klehr
3bc59f0a7c Add english translation file 2012-11-12 17:25:53 +01:00
Marcel Klehr
378a74fb4e Remove translated strings from template files 2012-11-12 17:24:14 +01:00
Marcel Klehr
4154d464a5 Fix german translation 2012-11-12 16:53:39 +01:00
Marcel Klehr
7021a8b885 Add pad setting for UI lang 2012-11-12 16:49:15 +01:00
Marcel Klehr
fb340793da Add an empty locales/en.ini - English is default lang in templates 2012-11-11 11:56:59 +01:00
Marcel Klehr
e914c972f4 Add german translation for index.html and pad.html 2012-11-10 14:13:51 +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
Marcel Klehr
a3504f70c4 Add i18n component 2012-11-10 14:12:17 +01:00
Marcel Klehr
e24ed46a08 PadMessageHandler: Make sure sessioninfos[session] still exists before pushing data to user. 2012-11-10 10:47:12 +01:00
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
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
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
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
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
6408581adb merged develop back in 2012-11-03 18:16:36 +00:00
johnyma22
2f123970e6 Make express restart - I think this reloads settings 2012-11-02 15:21:12 +00:00
johnyma22
1d055f2cd4 make stuff work 2012-11-02 15:15:13 +00:00
johnyma22
3ca450fefc make the server save settings 2012-11-02 15:10:01 +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
johnyma22
f6fa897a4e actually using text area is a lot less stupid 2012-11-02 14:31:52 +00:00
Chia-liang Kao
4827cdbd96 fix imported ol that were turned into ul 2012-11-02 21:39:40 +08:00
johnyma22
89e38ed4c2 Start putting file system together for admin settings, no where near complete 2012-11-02 13:16:15 +00:00
Marcel Klehr
6d543fbcb3 Add a setting for customizing the app title 
the app title is inserted into the <title> of all tepmlates
 2012-11-02 12:30:57 +01:00
Peter 'Pita' Martischka
d6d07570bf added webdriver to npm dependencies 2012-11-01 22:03:51 +00:00
Marcel Klehr
2d6e577683 Put up some '/admin doesn't exist' notice. 2012-11-01 19:45:26 +01:00
John McLear
5629063b9c Allow robots.txt to be custom 2012-11-01 13:32:04 +00:00
Marcel Klehr
ed2faa68c9 Pass on the req object to eejs hooks 2012-11-01 13:44:59 +01:00
Marcel Klehr
059f6d280e Pass on the render args to all eejs hooks 
eejs.require('foo', {..render args..}) will
be passed on to all eejsBlock_X hooks as `hookContext.renderContext`
 2012-11-01 13:44:06 +01:00
John McLear
28acfc70de Merge branch 'develop' of github.com:Pita/etherpad-lite into release/releases-1.1.5 2012-10-31 12:32:12 +00:00
johnyma22
d929877865 JS fix for #1077 fire event at start because of the resize issue, this is a clean way of doing it 2012-10-30 22:35:01 +00:00
johnyma22
d30bb6d892 fixes a tiny css bug #1077 2012-10-30 21:57:15 +00:00
johnyma22
14ef06c699 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests 2012-10-30 17:22:08 +00:00
johnyma22
12bd520846 bump version # 2012-10-30 13:51:29 +00:00
johnyma22
1c847dbde3 Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-10-29 22:48:32 +00:00
johnyma22
8d7a02816f remove opacity to fix opera bug #941 2012-10-29 22:47:42 +00:00
John McLear
b2446fa61f Merge pull request #1098 from Pita/span-two-lines-on-less-than-400px 
make anything less than 400px span 2 lines on toolbar and make popups ap...
 2012-10-29 15:00:11 -07:00
johnyma22
898331b680 fix rtl sanity 2012-10-29 21:55:57 +00:00
johnyma22
4f04d14cab Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-10-29 19:30:29 +00:00
johnyma22
0e41e9fdfc allow max chat to be 999 chars 2012-10-29 19:29:30 +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
Peter 'Pita' Martischka
0420b89382 Merge pull request #1097 from Pita/develop 
Pull in Develop branch so we can test latest develop
 2012-10-29 07:25:34 -07:00
John McLear
b4680e42d7 add a keystroke check for chat and make it so the chat listens on event 13 aswell as event 10 2012-10-28 17:38:56 +00:00
Marcel Klehr
78e64ffea8 Mimic, replace or work around removed npm utils. 2012-10-28 18:34:20 +01:00
Marcel Klehr
e447a6fade Make sure npm is initialized before requiring things (fix #1092) 2012-10-28 18:02:49 +01:00
Peter 'Pita' Martischka
9537892c61 wrap spec files with a describe 2012-10-27 17:29:17 +01:00
Peter 'Pita' Martischka
cac27c864a load list of spec files from the server 2012-10-27 17:05:26 +01:00
Peter 'Pita' Martischka
cc7ddddd2f redirect from frontend to frontend/ 2012-10-27 16:41:17 +01:00
Peter 'Pita' Martischka
f59b643aa6 Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests 2012-10-27 16:32:37 +01:00
Randy
399080ad73 Add IIS config file 2012-10-25 10:22:28 -07:00
Randy
596e20e123 Add default port of process.env.PORT if port isnt specified in settings.json 2012-10-25 10:21:34 -07:00
John McLear
2ecd5719fc Merge pull request #1073 from Pita/librejs-header 
Add LibreJS Licensing information to headers of HTML templates
 2012-10-25 06:53:38 -07:00
John McLear
a01768fc46 Merge pull request #1086 from neurolit/patch_relative_static_links 
Templates: relative links instead of absolute ones for /static directory
 2012-10-25 06:52:16 -07:00
John McLear
58d559b962 fix marcels trailing , 2012-10-25 05:24:42 -07:00
John McLear
9582881278 Merge pull request #1088 from marcelklehr/fix/update-npm 
Update npm
 2012-10-25 05:21:11 -07:00
John McLear
0e9695bfb0 Merge pull request #1089 from marcelklehr/legal/extend-collaboraters 
Add myself to the list of contributers
 2012-10-25 05:20:49 -07:00
Marcel Klehr
ff2824ae7a Add "Marcel Klehr" to contributers list 2012-10-25 13:45:40 +02:00
Marcel Klehr
1bc9d61027 Update npm (fix #1012) 2012-10-25 13:38:28 +02:00
0ip
cb760aae52 Fix broken layout (Chrome Mobile) 2012-10-25 14:37:41 +03:00
neurolit
526610e2e7 Templates: relative links instead of absolute ones for /static directory 
…irector

Two links were absolute ("/static/...") instead of relative
("../static"). The image was not loaded with sites behind reverse
proxies and subdirectory.
 2012-10-24 19:48:13 +02:00
Chia-liang Kao
8199bf8377 Do not assume window object exists 2012-10-23 15:21:05 +08:00
johnyma22
a770910a3a Add LibreJS Licensing information to headers of HTML templates 2012-10-17 17:53:28 +01:00
John McLear
429651874f Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexp 
Fix #1067 Corrected exports links regexp
 2012-10-16 13:36:20 -07:00
Marcel Klehr
6c89187f95 Fix #1067 Corrected exports links regexp 2012-10-16 20:46:27 +02:00
John McLear
b7d0751b18 couch, level, mongo, postgres, redis DB support 
Support for additional underlying databases
 2012-10-15 13:09:55 +02:00
John McLear
c45739becb Update src/package.json 
Bump version #
 2012-10-11 23:38:56 +02:00
NAGOYA, Yoshihiko
957a0aa873 fix Pita/etherpad-lite #1032 
refact inInternationalComposition
 2012-10-12 01:12:15 +09:00
John McLear
d7ec050f34 Merge pull request #1035 from amtep/develop 
Guard against malicious clients in USERINFO_UPDATE handling
 2012-10-11 08:27:27 -07:00
Marcel Klehr
bedc51d2e3 Merge pull request #1057 from dmitryuv/sync-processing 
fix for error handling in the callback code
 2012-10-11 08:08:47 -07:00
Marcel Klehr
b0099a4aba Add plugin-specific sections in settings.json 
Settings for specific plugins are written down as below:
{
  ...
  "ep_pluginname": {
    "foo":"bar"
  }
  ...
}
 2012-10-11 16:22:40 +02:00
Dmitry
dbcdc2f956 fix for error handling in callback code 
The callback code does not follow error handling guidelines, thus always
receiving NULL instead of results array.
 2012-10-11 18:07:45 +04:00
Marcel Klehr
1461c4e19a Merge pull request #1056 from dmitryuv/sync-processing 
Fix variable name in handleMessageHook
 2012-10-11 07:05:51 -07:00
Dmitry
0fa954c1a0 fixed variable name in handleMessageHook 
the code would never work as expected with this type
 2012-10-11 17:51:57 +04:00
Chad Weider
9d1274abaf Drop method deprecated in Express 3.x. 2012-10-09 01:32:21 -07:00
Peter 'Pita' Martischka
ca6ebd6151 major restructering of the front end test framework 2012-10-08 00:34:29 +02:00
John McLear
90373964d3 Remove two instances of the same function name 
Both functions did the same thing, the first function was buggy.  Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
 2012-10-06 02:36:51 +02:00
John McLear
db1a1a0e3e Merge pull request #1034 from d-a-n/develop 
Added hooks for pad events create/edit/load/remove
 2012-10-05 17:28:40 -07:00
johnyma22
5c54b2c681 attempt to move onClick away from HTML.. This is required 2012-10-04 21:16:58 +01:00
John McLear
a1280fd917 Merge pull request #1004 from yourcelf/develop 
Add `userColor` query param to set initial color
 2012-10-04 10:57:16 -07:00
johnyma22
c74aed986e Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests 2012-10-04 18:55:57 +01:00
johnyma22
a97c63b809 Fix issue caused by broken async update 2012-10-04 18:53:02 +01:00
John McLear
66475f32f3 Merge pull request #1003 from Pita/express-v3 
Upgrade Express to v3 [proposal]
 2012-10-03 06:25:44 -07:00
d-a-n
a521a12583 Changed pad_id to padID to follow projct standards. 2012-10-03 15:50:43 +03:00
d-a-n
358e481731 Changed pad hook names to follow naming conventions. Arguments will now be passed as hash. 2012-10-03 13:41:40 +03:00
Marcel Klehr
2684a1d295 Merge branch 'develop' into express-v3 
Conflicts:
	src/node/hooks/express/errorhandling.js
 2012-10-03 10:09:00 +02:00
Chad Weider
b29fc11e9d Upgrade to Yajsml bug fix. 2012-10-02 19:57:23 -07:00
Richard Braakman
85b44119ae USERINFO_UPDATE: construct a new message for broadcast 
The server was reusing the client's message when broadcasting userinfo
updates. This would allow a malicious client to insert arbitrary fields
into a message that the other clients would trust as coming from the
server. For example, adding "disconnect" or renaming other authors.

This commit fixes it by having the server construct a new message with
known fields before broadcasting.
 2012-10-02 23:27:30 +03:00
d-a-n
64a3d60b94 Added pad hooks (create, load, edit, remove) 2012-10-02 22:30:13 +03:00
Marcel Klehr
7656001cb5 Don't shut down the whole server, if error handling middleware is called. 
The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...
 2012-10-02 20:11:18 +02:00
John McLear
56453409a5 Update src/static/js/pad_editbar.js 
Somehow </iframe> was no more.  Now it is back..  Oh boy.
 2012-10-02 02:19:44 +02:00
Peter 'Pita' Martischka
ba4ebbba3b Setted up an enviroment for frontend tests, first steps 2012-10-02 00:35:43 +01:00
John McLear
7f6a81b0ed Merge pull request #1006 from cweider/ace-cleanup 
Ace cleanup
 2012-10-01 13:05:10 -07:00