public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,312 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

2312 Commits (4ce16b526ea6573fb739247a1bf732c29c455dc8)

Author SHA1 Message Date
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
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
John McLear a4c4d11cd4 fix letter s... 2012-11-30 15:26:51 -08:00
John McLear 2fe31bc618 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2012-11-30 15:19:47 -08:00
John McLear d761003588 fix path to favicon resolves #1236 2012-11-30 22:50:54 +00:00
Marcel Klehr ab148ebc1a Merge pull request #1229 from ether/control-s 
catch control S and send an event to save a revision -- fixes #1128
 2012-11-29 08:57:10 -08:00
John McLear 11af9228db Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2012-11-29 07:29:30 -08:00
John McLear 53d6d0813e Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers 
Let socket.io decide which transport is best for the browser
 2012-11-29 06:55:51 -08:00
Marcel Klehr 719fb7e045 Let socket.io decide which transport is best for the browser 2012-11-29 13:42:37 +01:00
Iván Eixarch 795a20b3f2 get languages availables through translatewiki API 2012-11-28 23:54:23 +01:00
John McLear 93e9d7c852 remove control S comment 2012-11-28 17:20:58 +00:00
John McLear 8c7939ec9f catch control S and send an event to save a revision 2012-11-28 17:17:35 +00:00
Iván Eixarch 9ec8a6e3d3 back to globalize... don't work :S 2012-11-28 04:02:55 +01:00
Iván Eixarch 1cc0e8cbf0 Restore original ini file 2012-11-28 03:27:09 +01:00
John McLear c445197e7f Update src/static/css/pad.css 2012-11-27 15:10:36 +00:00
Marcel Klehr 182ea62de9 Merge pull request #1218 from ether/remove-alert-on-wrap 
Remove alert on line wrap (editor) -- fix #277
 2012-11-27 06:22:28 -08:00
Marcel Klehr df8207e0df Merge pull request #1225 from disy-mk/patch-1 
Correct github repo link doc/api/http_api.md
 2012-11-27 06:09:04 -08:00