48d0d12f65
Merge branch 'master' into develop
...
Conflicts:
README.md
2012-12-07 15:21:58 +01:00
45b1e3eacb
Merge pull request #1249 from leblanc-simon/develop
...
Fix author colors in chat
2012-12-07 05:59:28 -08:00
c2cc292324
Update doc/api/http_api.md
...
Added docs for the checkToken function
2012-12-07 11:28:03 +01:00
4318d210ce
Update src/node/db/API.js
...
Corrected function documentation.
2012-12-07 11:28:03 +01:00
26ece95905
Update src/node/db/API.js
...
Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).
2012-12-07 11:28:03 +01:00
2163c8be5c
Update src/node/handler/APIHandler.js
...
Added the checkToken function to the function array.
2012-12-07 11:28:03 +01:00
8686da87e8
Update src/node/db/API.js
...
Added a checkToken method for checking if the API token is valid.
2012-12-07 11:28:03 +01:00
7427f9ba15
Update CONTRIBUTING.md
2012-12-07 11:27:58 +01:00
019d2e01be
Update CONTRIBUTING.md
2012-12-07 11:27:58 +01:00
b6bf0ab936
Update CONTRIBUTING.md
2012-12-07 11:27:58 +01:00
5bf79971b8
merged upstream develop
2012-12-07 08:59:13 +01:00
b01903202c
Added new strings to translate for js files
2012-12-07 05:24:40 +01:00
98e03c1d87
Merge pull request #1268 from ether/fix/eejs-block-caching
...
Fix #1247 , #1201 : Don't cache eejs blocks!
2012-12-06 12:13:39 -08:00
c909ed256f
Fix #1247 , #1201 : Don't cache eejs blocks!
...
Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
2012-12-06 18:35:35 +01:00
7933db4bc6
Merge pull request #1267 from goldquest/fix-import-hanging
...
Fix import state hanging. Issue #976 & #1105
2012-12-06 09:00:46 -08:00
1380fda2b2
use the parent window, not the top
2012-12-06 17:51:43 +01:00
0908caaf0d
Merge pull request #1265 from joker-x/develop
...
Avoid use of os.tmpDir() for keep node 0.6 compatibility
2012-12-06 04:34:08 -08:00
1a5035ae6b
reverse old change
2012-12-06 11:53:58 +01:00
bf04a4686a
avoid use of os.tmpDir() for node 0.6 compatibility
2012-12-06 11:49:04 +01:00
f9b6d9f122
Merge remote branch 'ether/develop' into develop
2012-12-06 11:22:05 +01:00
deb2c54487
Merge pull request #1264 from goldquest/develop
...
fix for multiple cookies support (Also fix for, when session is not valid anymore)
2012-12-05 18:12:07 -08:00
7631096135
fix for multiple cookies support (Also fix for, when session is not valid anymore)
2012-12-06 02:01:38 +01:00
4ce16b526e
Added semicolons
2012-12-06 02:00:58 +01:00
110620696e
Update README.md
2012-12-05 16:00:06 +00:00
6b3917cde7
Merge pull request #1257 from marcelklehr/fix/api-if-requireAuth
...
Fix #1219 : Make api work if requireAuth is enabled
2012-12-05 07:27:59 -08:00
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
c853f8fad2
Reduces the width of the file input to prevent overflow in the import popup
2012-12-05 15:02:32 +01:00
fe89a367cc
Fix #1226 : Chrome would load async js
2012-12-05 14:16:44 +01:00
2f37afac66
Merge pull request #1255 from 0ip/feature/show-pl-version
...
Display plugin version numbers in /admin/plugins
2012-12-05 05:09:20 -08:00
377ff1eade
Fix #1219 : Make api work if requireAuth is enabled
2012-12-05 14:04:48 +01:00
8d0ef88baf
Adjust select width
...
looks better :)
2012-12-05 12:55:48 +01:00
20f13bc8ce
Add comment to explain how the property containing the version is being read
2012-12-04 19:08:25 +01:00
1fc5519c86
Display plugin versions
2012-12-04 14:30:30 +01:00
ce71002644
Merge pull request #1223 from joker-x/languages4translatewiki
...
Added support for *all* translatewiki languages
2012-12-04 04:09:17 -08:00
a2b22652ce
added direction language in English
2012-12-04 13:02:23 +01:00
5f949b8457
Update language4translatewiki 0.1.3
2012-12-04 12:12:58 +01:00
b21c4403b2
Merge remote branch 'ether/develop' into languages4translatewiki
2012-12-04 11:40:17 +01:00
b82af40735
Update CONTRIBUTING.md
2012-12-03 18:16:19 +00:00
7e4b47f384
Update CONTRIBUTING.md
2012-12-03 18:15:55 +00:00
3c8258f54d
Update CONTRIBUTING.md
2012-12-03 18:15:39 +00:00
55d543f9ca
Merge pull request #1221 from ether/focus-on-password
...
proper fix for focus and some styling of the form and allows for pressin...
2012-12-03 06:35:16 -08:00
1e8d954560
best I can do with this temporary fix for IE
2012-12-03 14:28:25 +00:00
b3e55f64a8
stop password being clearly visible
2012-12-03 13:10:32 +00:00
0b92fdfc62
fix IE auth but only a temp fix
2012-12-03 12:47:11 +00:00
17fb60e483
Merge pull request #1248 from ether/improved-search
...
Improve plugin search
uses modules descriptions too now, bit more cpu heavy, but that's okay
2012-12-03 04:14:15 -08:00
d09894ce77
make it show password dialog on wrong password
2012-12-03 12:05:11 +00:00
4843840d72
last JS fix
2012-12-03 11:44:30 +00:00
b0463bd7d5
whoopsi
2012-12-03 11:41:51 +00:00
bef25b40f8
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-03 11:37:01 +00:00
84d154b168
Update strings, add UK strings, fix JS
2012-12-03 11:35:06 +00:00
Marcel Klehr