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

1376 Commits (1faae5b75618147f9efc5a6c7f9cdd9b84db5524)

Author SHA1 Message Date
Matthias Bartelmeß 2dd60b0b6d Merge branch 'develop' into ace2_refactoring 2012-04-03 19:30:57 +02:00
John McLear 8be52df515 Merge pull request #589 from fourplusone/fix_admin_undefined_auth 
Admin page security
 2012-04-03 07:51:18 -07:00
Matthias Bartelmeß 396b586dbd when no password is set, dont allow access to admin page 2012-04-03 14:17:19 +02:00
John McLear c7e3656df3 Merge pull request #587 from sfyn/c55f54b972e42cdaef6cb402d84027bd39ac5774 
Fix nocolor embed parameter
 2012-04-02 13:50:21 -07:00
Sofian Benaissa c55f54b972 Fix the nocolor embed parameter 2012-04-02 16:35:18 -04:00
John McLear 9ecd864ac6 Merge pull request #557 from redhog/master 
Templating system built on top of EJS and plugin installer
 2012-04-02 12:42:38 -07:00
Egil Moeller e06bf0e991 Basic auth for admin page 2012-04-02 18:45:37 +02:00
Egil Moeller 434252a321 Removed prefixfree as it breaks @import in css files 2012-04-01 22:55:04 +02:00
Egil Moeller ba00144bcd Button styling bugfix 2012-04-01 15:20:51 +02:00
Egil Moeller 47c4f46237 Moved star image to right directory 2012-04-01 14:52:16 +02:00
Egil Moeller 08cc3e128f Bugfix for timeslider styling 2012-04-01 14:33:39 +02:00
Egil Moeller 33c53e61c2 Merge branch 'johnyma22' 
Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html
 2012-04-01 13:27:38 +02:00
John McLear bc76913a6d fix pitas fix 2012-03-31 18:16:31 +01:00
John McLear 309e3b0994 fix pitas fix 2012-03-31 18:15:08 +01:00
Peter 'Pita' Martischka aaad7d1428 restructuring save/load process of a pad, this makes it easier to extend the meta data of a pad 2012-03-29 19:50:38 +01:00
Peter 'Pita' Martischka f631e1e8ab Added saved revisions support 2012-03-29 19:43:26 +01:00
John McLear 9c9e5db72d Add ability to export specific pad revisions 
Conflicts:

	node/utils/Minify.js
	node/utils/Settings.js
	static/css/timeslider.css
	static/js/pad_impexp.js
	static/timeslider.html
 2012-03-29 19:40:55 +01:00
Egil Moeller b74447aa3c Styling generalization - use classes instead of id:s where applicable 2012-03-28 19:20:07 +02:00
Matthias Bartelmeß 35c0a38a01 Merge branch 'develop' into timeslider_authors 2012-03-28 08:31:17 +02:00
John McLear c960186f8d Merge pull request #563 from fourplusone/objectify_ep 
Make old etherpad code more object oriented
 2012-03-27 17:26:47 -07:00
Egil Moeller 6120a0b7aa Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-03-27 22:36:48 +02:00
Egil Moeller 668725b892 Add jquery to ace iframe 2012-03-27 22:24:36 +02:00
Egil Moeller 8402cb118a One more exposed ace function 2012-03-27 22:24:16 +02:00
Egil Moeller c65216a09f Added client side hook postAceInit 2012-03-27 22:23:55 +02:00
Egil Moeller 12600446c2 Better argument handling and defaults 2012-03-27 22:23:28 +02:00
Matthias Bartelmeß 120340600a setupMozillaCaretHack is never called, so removing it should be safe 2012-03-27 12:29:22 +02:00
Matthias Bartelmeß a82cc07881 replaced function(){} with noop 2012-03-27 12:28:47 +02:00
Matthias Bartelmeß e7ac8d6d4a use underscore in skipList 2012-03-27 11:44:21 +02:00
Matthias Bartelmeß daca484747 Merge branch 'develop' into objectify_ep 
Conflicts:
	src/node/utils/tar.json
	src/static/js/ace2_inner.js
 2012-03-27 11:15:48 +02:00
John McLear beec69ac1c Merge pull request #556 from fourplusone/feature_jquery 
added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner
 2012-03-26 08:10:58 -07:00
Matthias Bartelmeß e463273901 added UI to for unnamed authors 2012-03-25 15:48:31 +02:00
Matthias Bartelmeß 94a9795a04 CSS candy 2012-03-25 00:29:03 +01:00
Matthias Bartelmeß 371aee2e19 Added timeslider author UI 2012-03-24 20:35:45 +01:00
Matthias Bartelmeß db67080ee9 Merge branch 'feature_jquery' into timeslider_authors 2012-03-24 19:01:39 +01:00
Matthias Bartelmeß 1478820d60 fixed error foreach error in timeslider.js 2012-03-24 19:01:04 +01:00
Matthias Bartelmeß 1789c6e1c5 proceed if plugin-definitions.json didn't load properly 2012-03-24 18:48:53 +01:00
Matthias Bartelmeß ef248555aa Send the Content-Type header for plugin-definitions.json in the right format 2012-03-24 18:48:53 +01:00
Matthias Bartelmeß 04f3faac4b re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. 2012-03-24 18:48:53 +01:00
John McLear f2ea56334d Merge pull request #571 from fourplusone/fix_ie9_plugins 
Fix ie9 plugins
 2012-03-24 07:58:07 -07:00
Matthias Bartelmeß 208d88cc03 proceed if plugin-definitions.json didn't load properly 2012-03-24 13:29:15 +01:00
Matthias Bartelmeß 8bf481f27b Send the Content-Type header for plugin-definitions.json in the right format 2012-03-24 13:28:17 +01:00
Matthias Bartelmeß cf1be9b4bf added underscore to tar.json 2012-03-23 20:22:49 +01:00
Matthias Bartelmeß 349bb595b9 corrected underscore path in hooks 2012-03-23 20:19:41 +01:00
John McLear debdc340af Merge pull request #570 from fourplusone/develop 
Re-enabled maxAge setting.
 2012-03-23 11:49:52 -07:00
Matthias Bartelmeß c407ad3d34 re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. 2012-03-23 19:28:46 +01:00
Egil Moeller d0ad90456e Merge commit '1a64a6c1' 2012-03-22 18:43:59 +01:00
Egil Moeller 22eaa6ffc0 Made it possible to disable minification again 2012-03-22 18:35:06 +01:00
Egil Moeller b8a4333d1b Exposed require to ejs pages! 2012-03-22 18:34:38 +01:00
Egil Moeller 5261ba5a69 Forward-ported some bugfixes from olad etherpad 2012-03-22 18:34:08 +01:00
Egil Moeller d21cc1912c Better error message for broken JSON 2012-03-21 19:29:59 +01:00