Commit Graph

1409 Commits (7a09d977310dd30b4a179f08149f246a7f6e1213)

Author SHA1 Message Date
0ip 7a09d97731 Fix #683 - Disabling authorship colors doesn't work 2012-04-30 17:40:29 +03:00
John McLear 34a2f8cb5d Merge pull request #684 from 0ip/remove_qr_code
Remove QR-code
2012-04-30 06:57:42 -07:00
0ip 23cdb2a5c6 Removed QR-Code 2012-04-30 15:54:21 +02:00
0ip 96eb8ac004 100% is not needed here http://ragefac.es/416 2012-04-29 21:19:34 +03:00
John McLear bf568b3477 Merge pull request #682 from fourplusone/fix/fix-677
fixed plugins.js
2012-04-29 11:13:45 -07:00
Matthias Bartelmeß fa622857b9 fixed plugins.js 2012-04-29 20:12:15 +02:00
John McLear 122986798e Merge pull request #681 from fourplusone/fix/fix-677
fixed socket.io in timeslider.js
2012-04-29 11:11:25 -07:00
Matthias Bartelmeß cbb5a043b8 fixed socket.io in timeslider.js 2012-04-29 20:04:00 +02:00
John McLear a73192b10d Merge pull request #680 from fourplusone/fix/fix-677
Fix #677
2012-04-29 10:57:35 -07:00
Matthias Bartelmeß 0e941b498e fix #677 2012-04-29 19:54:38 +02:00
John McLear f6bdbddfcc Merge pull request #679 from 0ip/highl_mod
Tidy up wobbly button highlighting code
2012-04-29 08:10:52 -07:00
John McLear c969e11a6b Merge pull request #678 from 0ip/admin_rel_paths
plugins.html ← Fix relative paths
2012-04-29 07:16:45 -07:00
0ip 2525f20ff4 Tidied up highlighting for currently opened module 2 2012-04-29 02:48:47 +02:00
0ip 4b272fe2e1 Tidied up highlighting for currently opened module 2012-04-29 01:00:31 +02:00
0ip c11df112e8 templates/plugins.html Fixed relative paths 2012-04-28 22:00:15 +02:00
John McLear 83648481c3 Merge pull request #671 from fourplusone/fix/baseurl
baseURL/fixing #670
2012-04-25 07:01:53 -07:00
Matthias Bartelmeß 513deef768 added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 2012-04-25 10:23:58 +02:00
John McLear d554420f57 Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing) 2012-04-21 01:23:13 +02:00
John McLear 3798f53f94 Merge pull request #660 from redhog/master
Unbreak last pull request (I forgot a dependency)
2012-04-20 16:21:04 -07:00
Egil Moeller d08f3ff5ee Bugfix dependencies 2012-04-21 01:17:27 +02:00
John McLear 16edda7d46 luke warm fix. 2012-04-21 00:16:10 +02:00
John McLear a5210ab27d Merge pull request #647 from etinquis/fixes
Fix + New Hook
2012-04-20 15:10:40 -07:00
John McLear b6be00c3ab Merge pull request #659 from redhog/master
Oups, forgot a debug print in there in the last pull request
2012-04-20 06:12:34 -07:00
Egil Moeller 9a67a3a1db Removed debug print 2012-04-20 15:08:50 +02:00
John McLear 0a9fcc267f Merge pull request #658 from redhog/master
Bugfixes for when plugins are installed as dependencies for other plugins
2012-04-20 05:56:57 -07:00
Egil Moeller 72c972b256 Bugfix for recursive dependency-installation and paths 2012-04-20 14:37:53 +02:00
0ip a743112170 Fix #626, Plugins don't work if pad is on a subdir 2012-04-19 19:44:44 +03:00
John McLear 4a7ab12859 Merge pull request #649 from rassie/patch-1
Corrected color picker: `jQuery(...).css('background-color')` returns…
2012-04-19 08:37:09 -07:00
John McLear 9fe8a7530d Merge pull request #641 from 0ip/highlight_module
Fix | Highlight currently opened module
2012-04-19 08:23:51 -07:00
John McLear 064568d169 Merge pull request #653 from 0ip/plugins_page
Restore plugin manager UI
2012-04-19 08:18:49 -07:00
0ip 31909f6e60 Added viewport 2012-04-19 17:04:44 +02:00
0ip ef88d2798e Restore overwritten plugin manager UI 2012-04-19 17:00:29 +02:00
John McLear fc6e5177a9 Merge pull request #651 from redhog/master
Actually usable plugin manager, and way better security/authentication management
2012-04-19 07:11:24 -07:00
Egil Moeller ecac40d062 Changed the authentication mechanism to support hooks 2012-04-19 16:04:03 +02:00
Egil Moeller 7b39da2d69 Bugfix for callFirst to actually call call hooks until it finds one that returns non-empty, which is actually usefull, as opposed to just calling one hook. 2012-04-19 16:03:42 +02:00
Nikolai Prokoschenko 576fe06682 Corrected color picker: `jQuery(...).css('background-color')` returns a hex notation in IE8 and `rgb()` in every other browser. 2012-04-19 16:44:19 +03:00
Egil Moeller ac36a99a72 More general basic auth 2012-04-19 14:25:12 +02:00
Martyn York da75b87d3c added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe. 2012-04-18 14:44:25 -07:00
Egil Moeller 4c1d94343f Better plugin admin interface 2012-04-18 13:43:34 +02:00
Egil Moeller d6f476312d Spelling bugfixes 2012-04-18 10:16:41 +02:00
John McLear 7ede4872b1 Merge pull request #645 from redhog/master
Bugfixes
2012-04-17 13:42:57 -07:00
Egil Moeller 7ab7ee9f5e Plugin admin fixes 2012-04-17 22:40:53 +02:00
Egil Moeller 6f774bc6a5 Separated out the code for the plugin manager 2012-04-17 22:40:46 +02:00
Egil Moeller f80f9fc59f Merge commit 'd5120c9' into pita 2012-04-17 22:34:45 +02:00
Egil Moeller 3a62c6d2ab Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange 2012-04-17 22:32:46 +02:00
0ip d75aeeaf8f pad_editbar adapated hacky highlighting of currently opened module to recent changes 2012-04-16 15:23:19 +02:00
0ip 3e47300587 template/pad.html removed id duplicates, moved revision button, converted TABS to spaces 2012-04-16 15:19:53 +02:00
0ip 9cbb897c45 template/pad.html removed some whitespace 2012-04-16 15:13:07 +02:00
John McLear 7cf4510bf5 Merge pull request #637 from fourplusone/feature/timeslider_cleanup
Feature/timeslider cleanup
2012-04-15 12:11:46 -07:00
John McLear 0e0e084077 Merge pull request #636 from fourplusone/fix/timeslider_authors
Fix/timeslider authors
2012-04-15 12:11:38 -07:00