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

1401 Commits (a73192b10dc29a3423da2330fbb6fbe5689f83c2)

Author SHA1 Message Date
johnyma22 28aeb24f86 add some sense to the buttons on the plugin page 2012-04-05 18:00:38 +01:00
johnyma22 d3cc8e3374 Make the console show the url that admin/plugins is available at 2012-04-05 17:49:03 +01:00
Matthias Bartelmeß ff9e407092 Minor coding style improvement. Does the same as before 2012-04-05 15:26:51 +02:00
Matthias Bartelmeß 2ccc70daf6 documented lineAndColumnFromChar 2012-04-05 15:25:17 +02:00
Matthias Bartelmeß 5833cb1037 renamed performDocumentApplyAttributesToRange to setAttributesOnRange and moved it to AttributeManager 2012-04-05 15:22:22 +02:00
Matthias Bartelmeß 093b7ab4bf added lineMarkerAttribute + more comments 2012-04-05 15:20:48 +02:00
Egil Moeller 8cd1298a16 Added init hook to install plugin database default content and the like 2012-04-05 01:48:12 +02:00
Egil Moeller 4325f0b907 Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff 2012-04-05 01:45:14 +02:00
Matthias Bartelmeß 9f02972af4 remove debugger statement 2012-04-05 01:08:01 +02:00
Matthias Bartelmeß 60942b09a4 fixing lineHasMarker 2012-04-05 01:07:47 +02:00
Matthias Bartelmeß 1b383dc9b8 Merge branch 'develop' into ace2_refactoring 2012-04-05 00:51:18 +02:00
Matthias Bartelmeß 23cda77b65 added AttributeManager, ChangesetUtils 2012-04-05 00:50:04 +02:00
John McLear be5aec7e20 Merge pull request #597 from fourplusone/fix/max-age 
Fix max-age
 2012-04-04 08:44:04 -07:00
Matthias Bartelmeß 137e06d52b Merge branch 'develop' into fix/max-age 2012-04-04 17:42:08 +02:00
Matthias Bartelmeß 5c4551b098 remove maxAge: undefined header, send maxAge even if set to 0 2012-04-04 17:41:03 +02:00
John McLear d7e94aa80a Merge pull request #596 from fourplusone/fix/client_plugins 
Fix/client plugins
 2012-04-04 08:40:05 -07:00
Matthias Bartelmeß 6c647baa02 Merge branch 'fix/client_plugins' into ace2_refactoring 2012-04-04 15:13:07 +02:00
Matthias Bartelmeß f34e13f761 on plugin definitions, only expose plugins with client_hooks registered. dont expose 'package' property 2012-04-04 15:10:27 +02:00
Matthias Bartelmeß 4acbb11fd5 Merge branch 'develop' into feature/implicit_hooks 2012-04-04 15:04:10 +02:00
Matthias Bartelmeß 5115f74f66 use hook name as function name, if not specified 
Example `"[hookName]": "ep_plugin/static/js/index:[hookName]"` becomes  `"[hookName]": "ep_plugin/static/js/index"`
 2012-04-04 15:03:28 +02:00
John McLear e387e25c05 Merge pull request #593 from fourplusone/nicer_code 
Removing node.extend
 2012-04-04 03:24:32 -07:00
Matthias Bartelmeß 5a77979486 make jshint happy 2012-04-04 09:51:46 +02:00
Matthias Bartelmeß b2173a1084 get rid of node.extend (since duplicated by underscorejs) 2012-04-04 09:40:18 +02:00
John McLear 49593a1c8e Merge pull request #592 from fourplusone/fix_crash_minify_dir 
fix crash if getFileCompressed fails (i.e. if /static/js is called)
 2012-04-03 12:08:03 -07:00
Matthias Bartelmeß 7fbcffb30b fix crash if getFileCompressed fails (i.e. if /static/js is called) 2012-04-03 20:42:02 +02:00
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