fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,330 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

2330 Commits

Author SHA1 Message Date
Stephan Jauernick 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
Stephan Jauernick 2163c8be5c Update src/node/handler/APIHandler.js 
Added the checkToken function to the function array.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick 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
John McLear 7427f9ba15 Update CONTRIBUTING.md 2012-12-07 11:27:58 +01:00
John McLear 019d2e01be Update CONTRIBUTING.md 2012-12-07 11:27:58 +01:00
John McLear b6bf0ab936 Update CONTRIBUTING.md 2012-12-07 11:27:58 +01:00
John McLear 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
goldquest 1380fda2b2 use the parent window, not the top 2012-12-06 17:51:43 +01:00
John McLear 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
Iván Eixarch 1a5035ae6b reverse old change 2012-12-06 11:53:58 +01:00
Iván Eixarch bf04a4686a avoid use of os.tmpDir() for node 0.6 compatibility 2012-12-06 11:49:04 +01:00
Iván Eixarch f9b6d9f122 Merge remote branch 'ether/develop' into develop 2012-12-06 11:22:05 +01:00
John McLear 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
goldquest 7631096135 fix for multiple cookies support (Also fix for, when session is not valid anymore) 2012-12-06 02:01:38 +01:00
goldquest 4ce16b526e Added semicolons 2012-12-06 02:00:58 +01:00
John McLear 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
Marcel Klehr 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
Guillaume AMAT c853f8fad2 Reduces the width of the file input to prevent overflow in the import popup 2012-12-05 15:02:32 +01:00
Marcel Klehr fe89a367cc Fix #1226: Chrome would load async js 2012-12-05 14:16:44 +01:00
Marcel Klehr 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
Marcel Klehr 377ff1eade Fix #1219: Make api work if requireAuth is enabled 2012-12-05 14:04:48 +01:00
0ip 8d0ef88baf Adjust select width 
looks better :)
 2012-12-05 12:55:48 +01:00
0ip 20f13bc8ce Add comment to explain how the property containing the version is being read 2012-12-04 19:08:25 +01:00
0ip 1fc5519c86 Display plugin versions 2012-12-04 14:30:30 +01:00
Marcel Klehr ce71002644 Merge pull request #1223 from joker-x/languages4translatewiki 
Added support for *all* translatewiki languages
 2012-12-04 04:09:17 -08:00
Iván Eixarch a2b22652ce added direction language in English 2012-12-04 13:02:23 +01:00
Iván Eixarch 5f949b8457 Update language4translatewiki 0.1.3 2012-12-04 12:12:58 +01:00
Iván Eixarch b21c4403b2 Merge remote branch 'ether/develop' into languages4translatewiki 2012-12-04 11:40:17 +01:00
John McLear 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
John McLear 1e8d954560 best I can do with this temporary fix for IE 2012-12-03 14:28:25 +00:00
John McLear b3e55f64a8 stop password being clearly visible 2012-12-03 13:10:32 +00:00
John McLear 0b92fdfc62 fix IE auth but only a temp fix 2012-12-03 12:47:11 +00:00
Marcel Klehr 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
John McLear d09894ce77 make it show password dialog on wrong password 2012-12-03 12:05:11 +00:00
John McLear 4843840d72 last JS fix 2012-12-03 11:44:30 +00:00
John McLear b0463bd7d5 whoopsi 2012-12-03 11:41:51 +00: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
root 84d154b168 Update strings, add UK strings, fix JS 2012-12-03 11:35:06 +00:00
John McLear b5c263dd37 improve search to use description too, bit more cpu heavy for thats okay 2012-12-03 01:41:01 +00:00
John McLear 433421cc91 Merge pull request #1205 from joker-x/master 
Importer convert to HTML by default and allow basic import/export features without abiword
 2012-12-02 16:57:55 -08:00
Iván Eixarch 657322db91 fixed git merge confict 2012-12-03 01:39:59 +01:00
John McLear 8a9045b335 remove ssl not enabled message 2012-12-02 18:33:31 +00: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
Siebrand Mazeland e9e4d65ad4 Localisation updates from http://translatewiki.net. 2012-12-02 12:35:02 +00:00
Iván Eixarch b0b64358f9 Merge remote branch 'ether/develop' into develop 2012-12-02 05:57:14 +01:00
Niklas Laxström d4b79a6cba Localisation updates from http://translatewiki.net. 2012-12-01 11:32:26 +00:00
John McLear eb93ce2aa6 a test for adding any letter from alphabet can be extended to include foreign cahrs infact please DO THIS 2012-11-30 23:33:22 +00:00
John McLear 3dcbd8dd4e fix the control S to save a revision 2012-11-30 23:28:34 +00:00