Lorenz Hübschle-Schneider
849da1b5a2
Implement reconnecting upon connection loss
...
TODO: test in various conditions
2015-02-17 09:42:48 +01:00
Lorenz Hübschle-Schneider
6522cd72d3
Fix Chrome application shortcut
...
closes #521
2015-02-08 10:42:28 +01:00
Lorenz Hübschle-Schneider
be6e356363
Settings module
2015-02-04 19:56:56 +01:00
David Cormier
a0f85f8589
Merge pull request #536 from glowing-bear/theme-colour
...
Add theme-color meta tag for Android 5
2015-01-19 09:58:01 -05:00
Lorenz Hübschle-Schneider
4476ff5064
Update dependenices
...
Angular 1.3.{2→9} has some nice bugfixes and features (esp for linky)
zlib.js was compressed a bit better, I don't think the code changed...
2015-01-18 12:05:21 +01:00
Lorenz Hübschle-Schneider
25ecdb7158
Add theme-color meta tag for Android 5
2015-01-18 11:48:51 +01:00
Anders Bergh
45ff81f7e7
Remove href="#" from the buffer list to prevent the status bar in Chrome.
2015-01-17 17:30:08 +01:00
Tor Hveem
638a4595c7
Merge pull request #530 from glowing-bear/twemoji
...
Adds emoji support using Twitter's twemoji
2015-01-13 13:58:06 +01:00
Tor Hveem
63c7e10832
Merge pull request #496 from glowing-bear/colourise-title
...
Parse colours in buffer title
2015-01-13 13:54:52 +01:00
Lorenz Hübschle-Schneider
1068f36a74
Clarify NSFW hiding help text in autoembed setting
2015-01-04 18:45:36 +01:00
Lorenz Hübschle-Schneider
f125c43ccb
Adds emoji support using Twitter's twemoji
2015-01-03 18:29:59 +01:00
Lorenz Hübschle-Schneider
1d4caa91cd
Parse colours in buffer title
...
Requires a WeeChat version including 013165209a
i.e., WeeChat 1.1 or a November 2014 nightly (or later)
(for previous versions, see https://github.com/weechat/weechat/issues/237 )
Fixes #308
2015-01-03 18:18:20 +01:00
Lorenz Hübschle-Schneider
7f7a32df0c
Close the correct tag
2014-11-20 14:09:49 +01:00
Tor Hveem
53325a4cd0
Merge pull request #508 from glowing-bear/fix-non-hash-channels
...
Fix non-#channels and single-symbol channels (#)
2014-11-20 13:23:37 +01:00
Lorenz Hübschle-Schneider
3bb9094ab4
Clarify unread only setting
2014-11-20 13:04:11 +01:00
Lorenz Hübschle-Schneider
9b7a778186
Fix non-#channels and single-symbol channels (#)
2014-11-20 12:59:33 +01:00
Lorenz Hübschle-Schneider
640eda8682
Update AngularJS 1.3.0 → 1.3.2
2014-11-08 10:30:35 +01:00
Lorenz Hübschle-Schneider
1f601e56c8
Fix linkification target
...
The target attribute was passed to the wrong filter
2014-11-06 16:31:31 +01:00
Lorenz Hübschle-Schneider
0bc7571217
Fix conflicts between URL/email and irc channel linkification
...
URL/email links take priority over IRC channel links with this filter order.
2014-11-06 13:55:33 +01:00
Lorenz Hübschle-Schneider
6ac133867c
Update encryption instructions
...
- use TLS instead of SSL
- put a link to my encryption guide for trusted relay
- unify port throughout instructions (9001)
2014-11-03 16:36:37 +01:00
Tor Hveem
84c425cb41
Merge pull request #484 from ailin-nemui/scrolling-poll2
...
[Please test] some scrolling updates via polling
2014-10-28 01:31:35 +01:00
Tor Hveem
1dc32fd847
Merge pull request #483 from glowing-bear/key-overlays
...
Show quick access keys on Alt keypress
2014-10-28 01:24:11 +01:00
Lorenz Hübschle-Schneider
d95abdd0df
Fix inline colour filter by applying to text nodes only
...
this requires traversing the line's DOM and manipulating things there
2014-10-27 21:54:38 +01:00
Ailin Nemui
a1f6012fcc
index: be extra careful to escape space in order to avoid uncollapsed space with white-space:pre
2014-10-26 21:21:24 +01:00
Ailin Nemui
0b15e2f74f
some scrolling updates
2014-10-24 12:26:21 +02:00
Ailin Nemui
9827710736
Support narrowing buffer selection with Alt+0-9 after using Alt+g or when onlyUnread is enabled, and show numeric overlays for Alt+0-9 keys on the buffers
2014-10-20 11:45:56 +02:00
David Cormier
7fa1b7cc9d
Create dark theme by extracting theme settings from glowingbear.css
...
* Remove style.css as those values should be themable as well.
* Update urls in index.html to link to dark theme by default
2014-10-18 14:42:41 -04:00
Lorenz Hübschle-Schneider
4fd5ceadb2
Don't automatically show NSFW content
...
Fixes #472
2014-10-16 15:50:36 +02:00
Lorenz Hübschle-Schneider
e26827242d
Update AngularJS to 1.3.0
2014-10-14 12:37:00 +02:00
Oystein Steimler
b9d95c6ea8
Shows how to set password in SSL help as well
2014-10-09 18:33:00 +02:00
Oystein Steimler
32b23bdc9b
Using port from connection settings in SSL help
2014-10-09 18:31:59 +02:00
Lorenz Hübschle-Schneider
e535099390
update angular to 1.3.0-rc3, underscore to 1.7.0, and favico to 0.3.5
2014-09-24 21:16:33 +02:00
Lorenz Hübschle-Schneider
2475ad2c61
Bufferlist design attempt
2014-09-17 13:24:27 +02:00
Ailin Nemui
91480e91ab
make the help more pleasant by adding kbd tags
2014-09-05 18:03:38 +02:00
Lorenz Hübschle-Schneider
89391c0c61
Don't capitalise host name
...
Fixes #439
2014-09-02 19:06:31 +01:00
David Cormier
658e876643
fixup font-family and font-size setting glitches
...
Replace fontSize placeholder by default value. Placeholders should be used
as suggestions, not effective values.
Remove spurious default value for fontFamily (it is defined right below)
2014-09-01 09:37:17 -04:00
David Cormier
9438c3844f
Ask confirmation before closing if user has unsent input
2014-08-31 11:14:56 -04:00
Lorenz Hübschle-Schneider
21f8f47efe
Split things up into logical blocks
2014-08-31 15:57:36 +01:00
Lorenz Hübschle-Schneider
64f412e047
Handle keypress events as well
...
keydown is not enough, because browsers. A (very very very) long
explanation that I read in part is at http://unixpapa.com/js/key.html
E.g. on my keyboard layout (neo2), I don't get a keydown event for alt+<,
which in QWERTY keys is alt + caps lock + u (or the key above shift next to
enter on the right side, which actually isn't present on QWERTY (not ' but to
the right of it - it's not there on a US layout, but it is # on QWERTZ). I do get
a keypress event though.
2014-08-26 12:44:34 +01:00
David Cormier
9e0e3d06ae
Merge pull request #419 from glowing-bear/glyphicon
...
Use "off" glyphicon instead of "remove"
2014-08-25 16:26:17 -04:00
Lorenz Hübschle-Schneider
9c99eefb83
update angularjs to 1.3 beta 19 to fix bug with quotes around URL
2014-08-25 12:40:49 +01:00
Lorenz Hübschle-Schneider
611abdf51a
Use "off" glyphicon instead of "remove"
...
Needs a few fixes to not look disproportionately large next to the cog.
Also remove that sodden trailing space.
2014-08-24 17:14:35 +01:00
Lorenz Hübschle-Schneider
4cdf86ed14
Remove bindonce for Angular 1.3 One-Time Bindings
2014-08-23 12:26:04 +01:00
Lorenz Hübschle-Schneider
d3b8df8bb0
Don't watch for changes on existing lines
...
How did we miss this angular 1.3 feature?
It appears to be a bit similar to bindonce, but also works in ng-repeat!
See https://docs.angularjs.org/guide/expression#one-time-binding
2014-08-23 11:46:05 +01:00
Lorenz Hübschle-Schneider
6fb2d6b364
Merge pull request #411 from torhve/wordbreak
...
Fix word breaking
2014-08-18 08:48:02 -07:00
Tor Hveem
7baffb15e0
Fix word breaking
...
Use break-all to force breaking in all browsers.
2014-08-14 15:35:40 +02:00
Lorenz Hübschle-Schneider
e46efba5cf
Update angular version from beta 8 to beta 18
...
ngFocus is broken in beta8
2014-08-13 08:39:56 +01:00
Robert Scullin
e3341f8d37
Fix for iOS status bar not being visible due to black background
...
Adds a meta tag to have the top status bar in iOS render with white
text rather than black text.
2014-08-02 01:35:17 -04:00
Nick Singer
d03b5b8a07
modified stylesheet and index.html for a better looking connection form
2014-07-31 22:14:22 +02:00
Lorenz Hübschle-Schneider
cd4b5c8abe
Display HTML colour codes inline
2014-07-31 14:20:42 +01:00
David Cormier
7c5a396171
Rename 'monospace' class to 'favorite-font'
2014-07-24 21:36:56 -04:00
Lorenz Hübschle-Schneider
7a374740af
Fix rendering of settings dialog on mobile
2014-07-23 19:22:23 +01:00
David Cormier
013cc03380
Merge pull request #349 from glowing-bear/dejquery
...
[PLEASE TEST] Remove dependency on jQuery
2014-07-21 16:18:57 -04:00
Tor Hveem
f95a84a93d
Merge pull request #376 from glowing-bear/readline
...
fix keybindings relying on caretPos
2014-07-21 16:42:13 +02:00
Lorenz Hübschle-Schneider
0984a2f8b4
Make readline/emacs keybindings a setting
...
Also fix some labels while we're at it
2014-07-21 15:38:28 +01:00
Tor Hveem
065d8a240d
New feature: Automatically connect
...
Check if user saved password, and then offer to automatically connect.
Use a angular watch on the autoconnect and connect as soon as user
selects it.
Check for error messages so it doesn't try to reconnect if there is
errors.
2014-07-20 14:32:53 +02:00
Tor Hveem
99cf794efc
Use title tag to explain keybindings
2014-07-20 13:21:39 +02:00
Lorenz Hübschle-Schneider
bc958a3f7b
Fix modal so that it reliably works on all plattforms
2014-07-20 11:40:23 +01:00
Tor Hveem
4081b18ed2
Add some emacs keybindings. Fixes #371
...
Add the most commonly used emacs/readline keybindings to input field and
document them.
Also change the wording on some of the old descritions to clarify
intent.
2014-07-20 12:21:46 +02:00
Tor Hveem
63f30215ed
Fix modal closing on mobile
...
Removing the click handler on the backdrop fixes it, because apparently
the inside listeners stop propagating. We should look for a fix on
backdrop clicking too. And we should also support clicking ESC to close
modal.
2014-07-19 15:05:15 +01:00
Lorenz Hübschle-Schneider
e236d937e2
Simplify usage of modal
2014-07-19 15:05:15 +01:00
Lorenz Hübschle-Schneider
640f3f8228
Remove jQuery and bootstrap js
2014-07-19 15:05:14 +01:00
Lorenz Hübschle-Schneider
7d5bc0f078
Accordion without jQuery / bootstrap js
...
it's not quite 100% as nice though
2014-07-19 15:05:14 +01:00
Lorenz Hübschle-Schneider
23fb4da05a
Implement modal without bootstrap.js and jQuery
2014-07-19 15:05:14 +01:00
Lorenz Hübschle-Schneider
8816fe221e
Animate sidebar with CSS transitions
2014-07-18 13:46:01 +01:00
Tor Hveem
f7ef7e95b9
Merge pull request #365 from glowing-bear/defaultsettings
...
Enable hierarchical server view by default
2014-07-18 14:25:47 +02:00
Lorenz Hübschle-Schneider
2c4a28f559
Enable hierarchical server view by default
...
Also fix its label
Fixes #331
2014-07-18 12:35:13 +01:00
Lorenz Hübschle-Schneider
fa6f108fe5
Make debug mode a parameter, not a setting
2014-07-18 12:17:19 +01:00
Lorenz Hübschle-Schneider
fcfd9fce91
Make it pretty
2014-07-17 15:06:39 +02:00
Tor Hveem
6a3b4a1506
new option for overriding font size
2014-07-17 15:06:39 +02:00
Tor Hveem
cdcdcb096b
User configurable font choice. Fixes #351
2014-07-17 15:06:38 +02:00
David Cormier
77ffbb2f22
Merge pull request #356 from torhve/swipefixes
...
Disable nicklist swipe
2014-07-16 17:04:58 -04:00
Tor Hveem
7f76ed69dd
Disable nicklist swipe
...
Behaviour was pretty unintuive with the previous way. This should be a
little more consistant
2014-07-16 19:47:57 +02:00
Tor Hveem
59040785aa
Clarify option.
2014-07-16 19:44:42 +02:00
Lorenz Hübschle-Schneider
a2cc3558c3
Remove ngAnimate for the moment, we're not even using it
...
It does have a very significant performance impact, in my
measurements, buffer switching is 30% faster without it!
2014-07-07 18:54:56 +01:00
David Cormier
528237071f
Merge pull request #343 from glowing-bear/defaultport
...
Fix default port
2014-07-02 08:55:44 -04:00
Kramer Campbell
b21662da3c
Remove duplicate source of truth with buffers.
2014-07-01 15:07:34 -07:00
Lorenz Hübschle-Schneider
9379a53543
Set placeholder text to "Port" instead so it is clear what is needed here
2014-06-30 20:25:10 +01:00
Lorenz Hübschle-Schneider
f5855e0712
Revert "Set port variable instead of placeholder"
...
This reverts commit 6b4d2fddbb
.
...because it didn't work. I just got an empty box and the variable wasn't set
2014-06-30 20:24:50 +01:00
David Cormier
8bdfd68438
Merge pull request #336 from glowing-bear/title-alt-text
...
Add buffer title to alt text
2014-06-23 14:56:47 -04:00
Kramer Campbell
9aa6a374cd
Add option to show seconds in timestamps.
2014-06-23 09:34:27 -07:00
Lorenz Hübschle-Schneider
04c8ef45ec
Add buffer title to alt text
...
Fixes #333
2014-06-23 17:09:38 +01:00
David Cormier
6b4d2fddbb
Set port variable instead of placeholder
...
Suggesting a port in the placeholder can be confusing, as it may
lead people to believe that this value will be sent to the server
while in fact it will not be.
Fix #324
2014-06-16 22:53:39 -04:00
Lorenz Hübschle-Schneider
f374bebc4e
Turn notimestamp into a positive setting (showtimestamp)
2014-06-07 19:52:22 +01:00
Lorenz Hübschle-Schneider
f69a1ce3c4
Fix scrolling on landing page (mobile)
2014-06-07 19:52:22 +01:00
Lorenz Hübschle-Schneider
92e7670637
Use our name in the title
2014-05-19 13:37:48 +01:00
Lorenz Hübschle-Schneider
e7eeac1be7
Use minified libraries
...
How did that happen? :O
2014-05-18 21:03:06 +01:00
Lorenz Hübschle-Schneider
7b6c1df954
Update angular to 1.3.0-beta.8
...
Fixes multibyte utf-8 issue
2014-05-12 13:43:04 +01:00
David Cormier
b7c508dc14
Merge pull request #300 from glowing-bear/indentation
...
Fix broken indentation and closing tags
2014-05-09 15:44:42 -04:00
Lorenz Hübschle-Schneider
f5223cc602
Fix broken indentation and closing tags
...
There were extraneous </div>s around, ugh
2014-05-09 17:49:07 +01:00
Lorenz Hübschle-Schneider
afc3aa169f
Reduce number of watchers for buffer list
...
One watcher for each buffer
One additional watcher for each buffer without activity
2014-05-09 16:46:46 +01:00
Lorenz Hübschle-Schneider
78056fd994
Remove unnecessary DOM element for plugin
2014-05-09 16:29:07 +01:00
Lorenz Hübschle-Schneider
bf4488a60a
remove nonexistent clickhandler nickAction
2014-05-09 16:16:33 +01:00
Lorenz Hübschle-Schneider
703953a0f6
Rename highlightNick to addMention
...
...because that's what it does
2014-05-09 09:13:46 +01:00
Lorenz Hübschle-Schneider
91bca211ee
Merge pull request #290 from torhve/sslerror
...
Better user feedback for connection problems
2014-05-07 18:20:08 +01:00
Tor Hveem
fbfeec8fca
Change the connect button text based on connection status
2014-05-06 22:00:02 +02:00
Tor Hveem
d2f11ad89d
Catch DOMException
2014-05-06 22:00:02 +02:00
Lorenz Hübschle-Schneider
b766b41ed4
Improve encryption instructions
2014-05-04 19:07:08 +01:00
Tor Hveem
dc077ac903
Improve CSS layout. Fix 98% bug that affects chrome/ff differently.
...
Conflicts:
css/glowingbear.css
2014-04-29 21:31:49 -04:00
Tor Hveem
a2969adf9b
Remove old cruft
2014-04-29 21:31:48 -04:00
Lorenz Hübschle-Schneider
26d43fa694
Merge pull request #272 from torhve/versionbump
...
Bump angular and underscore.js versions
2014-04-28 13:05:22 +01:00
Tor Hveem
3b74512c77
Bump versions
2014-04-26 22:56:30 +02:00
Lorenz Hübschle-Schneider
18d1f4716b
Revert "use ng-if to hide date instead of css"
...
That actually decreases performance, because it adds a watcher to every line
This reverts commit 16365db588
.
2014-04-26 16:50:04 +01:00
Lorenz Hübschle-Schneider
677ec7783d
Reduce usage of ng-show/hide to reduce number of useless DOM elements (fixed)
...
Progress in the direction of #87 , especially on mobile.
This version doesn't break everything for new users.
2014-04-26 16:49:56 +01:00
Lorenz Hübschle-Schneider
16365db588
use ng-if to hide date instead of css
2014-04-26 10:48:19 -04:00
David Cormier
253e2ffc60
Revert "Minimise usage of ng-show/hide to reduce number of useless DOM elements"
...
This reverts commit b4e1a5aaad
.
2014-04-24 23:20:56 -04:00
Felix Eckhofer
482639f7e6
Update URL to point to new Github Org
...
Travis-CI url to be updated at a later date?
2014-04-24 17:08:58 +02:00
David Cormier
aa42027e98
Merge pull request #258 from lorenzhs/performance
...
Performance improvements
2014-04-24 10:18:51 -04:00
Lorenz Hübschle-Schneider
e732d72550
Detect self-signed cert errors
2014-04-22 19:04:31 +02:00
Lorenz Hübschle-Schneider
b4e1a5aaad
Minimise usage of ng-show/hide to reduce number of useless DOM elements
...
Progress in the direction of #87 , especially on mobile.
2014-04-21 18:31:02 +02:00
Lorenz Hübschle-Schneider
3ad76d2ff3
Don't ng-repeat function calls, they're expensive
...
See http://tech.small-improvements.com/2013/09/10/angularjs-performance-with-large-lists/
2014-04-21 18:31:02 +02:00
David Cormier
81c5974369
Merge pull request #257 from lorenzhs/nickclick
...
Highlight user when clicking their nick
2014-04-19 10:07:50 -04:00
Lorenz Hübschle-Schneider
76d7572622
Highlight user when clicking their nick
2014-04-19 15:47:33 +02:00
Lorenz Hübschle-Schneider
16664cefc0
Double-tap escape to disconnect
2014-04-19 14:13:32 +02:00
David Cormier
2719caf956
Revert "Bring up number keypad for port on mobile phones, URL for address"
...
This reverts commit bbcdada331
.
2014-03-18 14:57:34 -04:00
Lorenz Hübschle-Schneider
bbcdada331
Bring up number keypad for port on mobile phones, URL for address
...
An alternative would be type="tel", which has bigger number buttons for me,
but it seems wrong to use.
2014-03-14 14:52:23 +00:00
Lorenz Hübschle-Schneider
f2680419b6
Use svg logo on landing page
2014-03-10 17:32:22 +00:00
Lorenz Hübschle-Schneider
2227e31fe4
Bigger logo on landing page
...
I rendered the svg with inkscape
2014-03-09 10:32:35 +00:00
David Cormier
a8b1fbd512
Move img directory to assets directory
2014-03-03 22:13:41 -05:00
Lorenz Hübschle-Schneider
aecae9f0e6
Optionally play a sound on notification
...
Fixes #42
TODO: find and add a sound file
2014-03-03 21:23:15 -05:00
David Cormier
9a40f61517
Merge pull request #196 from cormier/glowing-logo
...
Glowing logo
2014-02-28 09:11:58 -05:00
David Cormier
e274935537
Rename content -> buffer
...
Makes more sense as this variable is called "buffer" everywhere
else in the code base.
2014-02-27 21:55:42 -05:00
David Cormier
c4dc74ca8d
Make allLinesFetched an attribute of buffer
...
Remove noMoreLines from the rootScope.
2014-02-27 21:55:42 -05:00
Tor Hveem
ad68e32c08
Don't show fetch more lines when there aren't any
2014-02-27 21:55:42 -05:00
David Cormier
583a4bab58
Merge pull request #199 from torhve/improve-swipe
...
Increase swipe area
2014-02-27 21:37:10 -05:00
Tor Hveem
5dd11d72c0
Fix alt-n again
2014-02-28 00:31:32 +01:00
Tor Hveem
4fccf9dc8d
Fix HTML syntax error
2014-02-28 00:14:33 +01:00
Tor Hveem
93a7e524d3
Increase swip area
2014-02-28 00:00:37 +01:00
David Cormier
b0df74a59e
Add glowing bear logo
...
Replace weechat logo with a bear that glows
2014-02-27 08:47:45 -05:00
Tor Hveem
d21267289c
Modal for settings instead of dropdown
2014-02-27 08:09:50 -05:00
Tor Hveem
9dfcc06c41
Bump bootstrap
2014-02-27 08:09:50 -05:00
Tor Hveem
5ac710a694
Fixes warnings in console with getelementid in firefox
2014-02-27 08:09:50 -05:00
Tor Hveem
3f1984859e
Makes buffer switching a little bit faster if you don't use nicklist
2014-02-26 01:36:36 +01:00
David Cormier
c04b6e64f6
Let user specify the id of the input bar
...
Input bar id is not globally set, but passed to the directive
through the input-id attribute.
2014-02-25 09:12:52 -05:00
Felix Eckhofer
6d0dea1004
Rework installation instructions
...
- Add note on installation being optional
- Add some instruction how to create app shortcut for Chrome
2014-02-23 17:18:03 +01:00
David Cormier
335e31fa1f
Merge pull request #173 from lorenzhs/mobilescroll
...
Improve mobile behaviour
2014-02-22 22:27:15 -05:00
Lorenz Hübschle-Schneider
6cfabdd0bd
Extend swipe region. Still not optimal.
...
It would be nice if we could scroll on the whole `content` div, but then the
open sidebar and close nicklist swipes collide
2014-02-22 11:40:22 +00:00
David Cormier
a28ee6033b
Merge pull request #163 from lorenzhs/flashtitle
...
Flash title when receiving lines in the background & make use of favico configurable
2014-02-21 09:58:28 -05:00
David Cormier
7b79d7dc5a
Merge pull request #166 from torhve/swipe-animate
...
Use ngAnimate to animate sidebar hiding/showing
2014-02-21 09:46:36 -05:00
Tor Hveem
056aa3deed
Use CSS classes instead of javascript for margin
2014-02-21 15:35:06 +01:00
Lorenz Hübschle-Schneider
df1bb08749
Only update title for notifications, not other kinds of activity
...
Also make the unread count the first thing in the title
2014-02-21 10:22:27 +00:00
Felix Eckhofer
e0aef4c6e1
make enter switch to the first match in the list
2014-02-21 09:55:56 +01:00
Felix Eckhofer
212aa1ba69
use consistent format to explain shortcuts
2014-02-21 09:45:56 +01:00
Felix Eckhofer
fead046eed
use alt-g for filter bufferlist
...
this is more consistent with the other existing shortcuts and is also
the same shortcut go.py recommends in weechat-curses
2014-02-21 09:45:56 +01:00
Tor Hveem
46b503e1b4
Use ngAnimate to animate sidebar hiding/showing
2014-02-21 09:34:30 +01:00
Lorenz Hübschle-Schneider
9ac7b341ec
Make use of favico an option
...
@tribut: does this resolve your issue?
2014-02-20 22:47:24 +00:00
David Cormier
5b5082dfd4
Merge pull request #160 from cormier/previous-buffer
...
PR#155 with shortcut added in front page instructions
close #155
2014-02-19 11:53:06 -05:00
David Cormier
d14afb9c81
Add previous buffer shortcut to instructions
2014-02-19 11:50:18 -05:00
David Cormier
11e5b6fbda
Merge development branch of creesch
2014-02-19 09:58:31 -05:00
Lorenz Hübschle-Schneider
e5476dfd02
Whitespace fixes, some {} blocks
2014-02-18 18:13:23 +00:00