kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity
4,919 Commits 3 Branches 49 Tags
Commit Graph

4919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicholas Hubbard
bb63232f55 Update the installer to allow condensed installation. 
Condensed installation is where the user Git Clones the repo and runs the installer there.
 2016-04-04 13:57:09 -04:00
Nicholas Hubbard
43288b2e97 Update the README for better disclosure of installation script. 2016-04-04 13:54:49 -04:00
Nicholas Hubbard
824eade8b2 Update installation script for Pi 3 support. 2016-04-04 12:28:07 -04:00
Nicholas Hubbard
df26058172 Add installation script for ease of installation. 2016-04-04 12:19:13 -04:00
Nicholas Hubbard
2f3219704e Add badges and fix Usage list formatting. 2016-04-03 20:39:01 -04:00
Nicholas Hubbard
5c0532e6c6 Some branding, grammar and spelling updates. 2016-04-03 19:43:31 -04:00
Michael Teeuw
a4d5b74b57 Fixes encoding issues: #125 & #126 2016-04-03 23:16:59 +02:00
Michael Teeuw
864106d336 Merge pull request #132 from paviro/v2-beta 
Fixed mistake that happens when no type is given
 2016-04-03 20:43:35 +02:00
Paul-Vincent Roll
5a612e792e Fixed mistake that happens when no type is given 2016-04-03 20:41:03 +02:00
Michael Teeuw
e473dfc15e Merge pull request #131 from paviro/v2-beta 
Use SHOW_ALERT for all type of notifications
 2016-04-03 20:36:18 +02:00
Paul-Vincent Roll
f931316dc8 No type = alert 2016-04-03 20:34:47 +02:00
Paul-Vincent Roll
e323a315e1 README ms not seconds 2016-04-03 20:31:09 +02:00
Paul-Vincent Roll
a55a2bcca0 Use SHOW_ALERT for all type of notifications 2016-04-03 20:28:51 +02:00
Michael Teeuw
f0c739c94c Add Contributing. 2016-04-03 20:27:56 +02:00
Michael Teeuw
60db5abb54 Change default port to port 8080. 2016-04-03 20:27:56 +02:00
Michael Teeuw
9ab7356730 Merge pull request #130 from paviro/v2-beta 
Removed no longer existing params
 2016-04-03 20:15:50 +02:00
Paul-Vincent Roll
7f2537f9b1 Removed no longer existing params 2016-04-03 20:13:22 +02:00
Michael Teeuw
6fe3ca1058 Merge pull request #129 from paviro/v2-beta 
Added alert todos
 2016-04-03 20:12:34 +02:00
Paul-Vincent Roll
99dbb3abed Added alert todos 2016-04-03 20:08:22 +02:00
Paul-Vincent Roll
053bdd0467 Merge pull request #14 from MichMich/v2-beta 
Update from Master
 2016-04-03 20:05:55 +02:00
Michael Teeuw
5554dce924 Fix merge conflict. 2016-04-03 19:56:01 +02:00
Michael Teeuw
ec7a4734df Merge branch 'v2-beta' of https://github.com/MichMich/MagicMirror into pr/120 
# Conflicts:
#	README.md
 2016-04-03 19:55:35 +02:00
Michael Teeuw
40e3e71b48 Fix merge conflict. 2016-04-03 19:53:36 +02:00
Michael Teeuw
5eed80c28e Squashed commit of the following: 
commit e38dd346d9f796807ea71035c18e3533ec245ba6
Author: Michael Teeuw <michael@xonaymedia.nl>
Date:   Sat Apr 2 19:17:30 2016 +0200

    Add the possibility to set the maximum number of days.

commit 6f5c86775b708d19d3798267ffd23e491a1d2c62
Author: Sam Vendittelli <sam.vendittelli@hotmail.com>
Date:   Sat Apr 2 06:27:44 2016 +0100

    Fixed cursor appearing in margin

    Cursor was appearing in the margin so moved `cursor: none` property to html.

commit 576c668d84b34b8ad7a0fd51b146fde60f721682
Author: Domi-G <lessuseguy+githubdomig@gmail.com>
Date:   Fri Apr 1 22:52:32 2016 +0200

    Huge cleanup of white space
 2016-04-03 19:52:13 +02:00
Paul-Vincent Roll
e2436ad796 Updated install instructions 2016-04-03 17:46:09 +02:00
Paul-Vincent Roll
7f0d82e960 Fixed README 2016-04-03 13:32:17 +02:00
Paul-Vincent Roll
5ecdca28fb Added Alert module to README 2016-04-03 13:02:49 +02:00
Paul-Vincent Roll
67bd6eac99 Use seconds instead of ms 2016-04-03 04:03:57 +02:00
Paul-Vincent Roll
f8ce8ece1e Removed SweetAlert License 2016-04-03 03:07:59 +02:00
Paul-Vincent Roll
679521c8a0 Removed sweetalert added custom alerts 2016-04-03 03:04:38 +02:00
Paul-Vincent Roll
f8c1644dee Added text alignment based on position 2016-04-03 00:20:11 +02:00
Paul-Vincent Roll
882e9731ac Added position config 2016-04-02 23:54:15 +02:00
Paul-Vincent Roll
3cd882f618 Notification styling 2016-04-02 20:27:59 +02:00
Paul-Vincent Roll
98e333cef9 Added title to notification 2016-04-02 20:05:05 +02:00
Paul-Vincent Roll
21a0063756 removed ns-style-growl.css now in default 2016-04-02 19:57:52 +02:00
Paul-Vincent Roll
76f1a82746 Allow multiple notifications 2016-04-02 19:56:19 +02:00
Michael Teeuw
e38dd346d9 Add the possibility to set the maximum number of days. 2016-04-02 19:17:30 +02:00
Paul-Vincent Roll
a8184ec17d Allow welcome_message = false 2016-04-02 19:12:59 +02:00
Paul-Vincent Roll
5fb751222b Added table to developer alert parameters 2016-04-02 14:57:29 +02:00
Paul-Vincent Roll
9910af04b0 added Configuration options as table 2016-04-02 14:46:46 +02:00
Sam Vendittelli
6f5c86775b Fixed cursor appearing in margin 
Cursor was appearing in the margin so moved `cursor: none` property to html.
 2016-04-02 07:27:44 +02:00
Paul-Vincent Roll
9c78af65e1 Added new option and licenses 2016-04-02 04:17:58 +02:00
Paul-Vincent Roll
e14010da35 Now supports alerts and notifications 2016-04-02 03:59:18 +02:00
Sam Vendittelli
c61278f1ad Fixed cursor appearing in margin 
Cursor was appearing in the margin so moved `cursor: none` property to html.
 2016-04-01 23:23:44 +01:00
Domi-G
576c668d84 Huge cleanup of white space 2016-04-01 22:52:32 +02:00
Paul-Vincent Roll
f93a464b7d Added howto for developers 2016-04-01 22:07:50 +02:00
Paul-Vincent Roll
06271678a6 Added alert module 2016-04-01 22:05:09 +02:00
Paul-Vincent Roll
af0ea4d555 Merge pull request #12 from MichMich/v2-beta 
Update V2 beta from master
 2016-04-01 21:59:18 +02:00
Michael Teeuw
e448e87252 Prevent weird start effect. 2016-04-01 17:49:43 +02:00
Michael Teeuw
e4c54cc655 Add module subfolder support. 2016-04-01 17:35:29 +02:00