GitHub/butterfly
1
0
Fork 0
mirror of https://github.com/paradoxxxzero/butterfly.git synced 2026-05-26 07:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
164 Commits 6 Branches 19 Tags
74193530dff6dd72d8b4fb875cb39a4fc947de3e
Commit Graph

164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Mounier
74193530df Merge both behaviors 2015-04-08 15:25:18 +02:00
Florian Mounier
287cbf4e82 Merge branch 'master' into domscroll_try2 2015-04-08 15:13:02 +02:00
Florian Mounier
1df84b3ee6 Add overflow: hidden rather than auto. Fix #74 2015-04-08 11:36:48 +02:00
Florian Mounier
7d0c69ea4d Merge branch 'master' of github.com:paradoxxxzero/butterfly 2015-04-08 11:30:31 +02:00
Florian Mounier
c2bde7b3b6 Add server option for enabling very unsafe html escapes and change them to DCS 2015-04-08 11:27:17 +02:00
Mounier Florian
87d76ba36d Merge pull request #65 from sekka1/master 
Add Docker file container build
 2015-02-13 16:51:27 +01:00
Florian Mounier
16a1dae39c Remove extraneous line feed 2015-01-29 11:27:17 +01:00
Florian Mounier
41616f8163 Fix trim + fx 2015-01-28 15:31:40 +01:00
Florian Mounier
8754085deb Improve copy paste 2015-01-28 13:15:42 +01:00
sekka1
e1eb02ef80 adding docker usage info 2015-01-27 18:32:07 -08:00
sekka1
7ec715cc38 adding server port parameter 2015-01-27 11:06:58 -08:00
sekka1
366ba5a67b fixing docker command 2015-01-27 10:46:50 -08:00
sekka1
f7a4346aa0 fixing password change 2015-01-27 10:43:22 -08:00
sekka1
6b2517ff93 adding docker build and run files 2015-01-27 10:33:45 -08:00
Florian Mounier
66846b50a2 Better nbsp handling: visual nbsp + selection tools now paste space instead of nbsp if it was originally a space 2014-12-15 11:06:35 +01:00
Florian Mounier
7e0e7f60d9 Merge branch 'master' of github.com:paradoxxxzero/butterfly 2014-11-20 14:34:11 +01:00
Florian Mounier
728912299c Don't set ssl_version by default references #60 2014-11-20 14:34:04 +01:00
Mounier Florian
e70d7e0317 Merge pull request #59 from onjin/master 
Support to pass command with arguments to --cmd option
 2014-11-19 17:06:58 +01:00
Marek Wywiał
80dd8c1029 Support to pass command with arguments to --cmd option 2014-11-19 16:09:03 +01:00
Florian Mounier
7c948fc23a Bump 2014-11-19 12:11:26 +01:00
Mounier Florian
1cf98b18c6 Merge pull request #58 from onjin/master 
Ability to run any command instead of shell using --cmd parameter
 2014-11-19 12:08:44 +01:00
Florian Mounier
7953e0647d Add ssl_version option. Fix #56 2014-11-19 11:01:04 +01:00
Marek Wywiał
dc5860e16d Ability to run any command instead of shell using --cmd command line parameter 2014-11-06 15:04:15 +01:00
Florian Mounier
764a9b7884 Remove systemd socket env vars to not fail other systemd compatible daemons launched inside butterfly 2014-08-21 16:42:38 +02:00
Florian Mounier
beb28d7a61 Fix setup.py 2014-07-18 17:13:50 +02:00
Florian Mounier
488e03246c - Add alarm mode [alt+A] for now 
- isolate ext modules
- remove now useless scss
- update node deps
 2014-07-18 16:04:12 +02:00
Florian Mounier
0a23565302 Remove useless scss files 2014-07-18 11:11:56 +02:00
Florian Mounier
c0943dfde9 Update libs 2014-07-18 11:11:07 +02:00
Florian Mounier
2db77cc250 Fix for tornado 4.0 2014-07-16 15:47:07 +02:00
Florian Mounier
3b6578658b And some docs 2014-07-11 16:10:33 +02:00
Florian Mounier
ea072ea24d Enable systemd socket activation. Fixes #48. (Bump to 1.5.3) 2014-07-11 16:04:44 +02:00
Florian Mounier
75cd2a267a Missing style 2014-05-21 14:51:31 +02:00
Florian Mounier
985d8b86e6 Merge branch 'master' into domscroll_try2 
Conflicts:
	butterfly/static/main.css
	butterfly/static/main.js
	coffees/term.coffee
	sass/_16_colors.sass
 2014-05-19 12:57:56 +02:00
Florian Mounier
585c1b876f Indent before merge 2014-05-19 12:52:45 +02:00
Florian Mounier
cbaa83e722 No need to decrement columns anymore 2014-05-19 12:01:18 +02:00
Florian Mounier
7f20325b3a With the js 2014-05-19 11:50:38 +02:00
Florian Mounier
e80b5f192d Fix wrong early char size computation 2014-05-19 11:47:41 +02:00
Florian Mounier
80cfc39f07 Bump 1.5.1 2014-05-16 12:01:25 +02:00
Florian Mounier
d7298f6229 Fix infinite exception loop: KeyError Exception in callback None 2014-05-16 12:00:05 +02:00
Florian Mounier
f9c9700062 Fix #34 (the off was not working) 2014-05-12 10:01:49 +02:00
Florian Mounier
eee9fdfba2 Fix for new option login 2014-05-05 12:33:09 +02:00
Florian Mounier
eb869a58d2 Merge remote-tracking branch 'creckx/master' 
Conflicts:
	butterfly/routes.py
 2014-05-05 12:16:16 +02:00
Florian Mounier
bbd216fe3f Support custom stylesheets: /etc/butterfly/style.[s]css and ~/.butterfly/style.[s]css with scss import support. References #20 2014-05-05 12:04:19 +02:00
Florian Mounier
34c6718d8c Closed effect 2014-04-30 16:09:46 +02:00
Florian Mounier
3772754c2f To grunt and libsass 2014-04-30 15:48:16 +02:00
Florian Mounier
253dd61e38 Start gruntification 2014-04-30 11:03:57 +02:00
Florian Mounier
5330429b7a Remove crashing log on non-linux 2014-04-25 11:19:56 +02:00
Florian Mounier
8cf1f75224 Fix #42 2014-04-25 09:53:04 +02:00
Florian Mounier
84f5cce7ea Set gid and initgroups 2014-04-22 10:03:23 +02:00
Adam Strauch
6a0bdf2147 Argument to turn login screen off (--host=0.0.0.0 --unsecure --login=False) 2014-04-13 14:19:08 +02:00