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

365 Commits (a5965bcdb5057687ffe9a89b10dae180de55cc32)

Author SHA1 Message Date
Iván Eixarch 9f1872afc1 use properties notation 2012-12-09 08:56:58 +01:00
Iván Eixarch 854ed56037 Merge remote branch 'ether/develop' into jstranslate 2012-12-09 08:43:19 +01:00
Marcel Klehr 45b1e3eacb Merge pull request #1249 from leblanc-simon/develop 
Fix author colors in chat
 2012-12-07 05:59:28 -08:00
Iván Eixarch b01903202c Added new strings to translate for js files 2012-12-07 05:24:40 +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
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
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
Simon Leblanc 38b14c40f0 Add same color in pad and chat for author 2012-12-03 03:43:56 +01: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
Iván Eixarch 657322db91 fixed git merge confict 2012-12-03 01:39:59 +01: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
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 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
John McLear c445197e7f Update src/static/css/pad.css 2012-11-27 15:10:36 +00:00
John McLear f880473360 remember the styling for the pasword prompt 2012-11-26 20:54:28 +00:00
John McLear fddca354b3 proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix 2012-11-26 20:52:10 +00:00
John McLear b66c9135f7 Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap 2012-11-26 20:20:21 +00:00
John McLear 6239c66e36 remove alert on line wrap as it doesnt mean anything 2012-11-26 20:19:27 +00:00
John McLear 491bf515c6 Merge pull request #1199 from leblanc-simon/develop 
improving the translation of the timeline
 2012-11-26 11:48:08 -08:00
Wikinaut a49bab5dae fix timeslider rightstep button position 2012-11-26 08:54:13 +01:00
Iván Eixarch d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
Iván Eixarch 0250f8d55c Merge remote branch 'ether/develop' 2012-11-23 22:57:05 +01:00
Iván Eixarch cc60b82a6e Import html by default and allow basic import/export features without abiword 2012-11-23 22:55:25 +01:00
Simon Leblanc 94e9cf0a32 improving the translation of the timeline 2012-11-23 06:20:09 +01:00
John McLear 1899e3f48d Merge pull request #1197 from hcartiaux/urlfix 
Fix urls, use github.com/ether
 2012-11-21 16:22:21 -08:00
Hyacinthe Cartiaux d6027726e6
Fix urls, use github.com/ether 
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
 2012-11-22 01:12:30 +01:00
Mike Brousseau 196aafd9d6 Update src/static/js/pad.js 
Gramatically change. Changed "You're Password" to "Your Password".
 2012-11-21 13:35:47 -05:00
John McLear 34df9d651e Merge pull request #1188 from joker-x/master 
Allow ! in pads urls
 2012-11-21 09:53:58 -08:00
Marcel Klehr dcb3da829d Fix #1186 Autodetection wouldn't work correctly in IE9 2012-11-21 17:45:01 +01:00
Iván Eixarch beb5bf4d7d Merge remote branch 'ether/develop' 2012-11-21 03:37:42 +01:00
Iván Eixarch 0c70ada9d7 Allow ! in urls autodetection 2012-11-21 03:35:49 +01:00
Marcel Klehr 8a23c2ff50 Use ; as comments indicator in i18n files 2012-11-20 22:08:42 +01:00
0ip 6b6315ca3c Tidy up settings 2012-11-14 14:26:49 +01:00
Peter 'Pita' Martischka 6de7634357 merged develop back in 2012-11-13 07:43:48 -08:00
Peter 'Pita' Martischka 4c095202bd Merged branch feature/frontend-tests 2012-11-13 07:29:57 -08:00