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 |
|
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 |
|
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ß
|
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ß
|
1478820d60
|
fixed error foreach error in timeslider.js
|
2012-03-24 19:01:04 +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 |
|
Egil Moeller
|
50474dff1f
|
Some new blocks to allow plugins to add scripts, styles and modals
|
2012-03-21 19:29:06 +01:00 |
|
Egil Moeller
|
1ca12b24e6
|
Bugfixes for plugin installer
|
2012-03-21 19:28:39 +01:00 |
|
Egil Moeller
|
7304a9ef3f
|
Bugfix for misplaced hook call
|
2012-03-21 19:27:43 +01:00 |
|
Egil Moeller
|
37c0d279c1
|
Bugfix for when a block hook calls eejs.require recursively
|
2012-03-21 19:27:06 +01:00 |
|
Egil Moeller
|
c591efb352
|
Plugin list can now be reloaded 'live'
|
2012-03-19 17:16:49 +01:00 |
|
Egil Moeller
|
6fe7f2c2b2
|
Plugin list can now be reloaded 'live'
|
2012-03-19 16:59:57 +01:00 |
|
Matthias Bartelmeß
|
38742401c9
|
newSkipList() -> new SkipList()
|
2012-03-18 11:34:56 +01:00 |
|
Matthias Bartelmeß
|
902837f295
|
renaming AttributePoolFactory
|
2012-03-18 09:06:29 +01:00 |
|
Matthias Bartelmeß
|
8eb43a3ebf
|
replaceing AttributePoolFactory by AttributePool
|
2012-03-18 09:05:46 +01:00 |
|
Egil Moeller
|
af96509fbb
|
Plugin install/uninstall
|
2012-03-17 18:17:10 +01:00 |
|
Matthias Bartelmeß
|
e559df18ce
|
use underscore.js
|
2012-03-17 13:38:26 +01:00 |
|
Matthias Bartelmeß
|
692e77b4e5
|
Merge branch 'feature_jquery' into use_natives
Conflicts:
src/static/js/ace2_inner.js
src/static/js/pluginfw/plugins.js
|
2012-03-16 18:50:32 +01:00 |
|
Matthias Bartelmeß
|
d0dd746c8b
|
added .keys method to objects, if not supported, fixes IE issue with pluginfw
|
2012-03-16 18:21:28 +01:00 |
|
Matthias Bartelmeß
|
0e731a2645
|
Merge branch 'fix_crashes' into use_natives
|
2012-03-16 18:07:19 +01:00 |
|
Egil Moeller
|
81250cba15
|
Searching for plugins, plus handling async events from the server (progress)
|
2012-03-15 21:07:48 +01:00 |