Commit Graph

7 Commits

Author SHA1 Message Date
883f999215 Merge remote-tracking branch 'origin/master' into frontend-1047 2016-07-21 08:53:23 -07:00
99ec188813 Merge remote-tracking branch 'origin/open254' 2016-07-18 11:35:43 -07:00
d6e1737803 [Frontend] Merge master into frontend-1047
Fixes #1047
Resolved conflict in icomoon.json file
2016-07-18 10:29:32 -07:00
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
ea1780364b [Dialog Service] Dismiss individual dialogs. Fixes #254 2016-06-29 20:12:12 -07:00
8bb8db69e6 [Frontend] Refactoring glyphs to classes
Fixes #1047
In-progress; indicators, notifications, actions,
tests
2016-06-28 14:47:52 -07:00
1e6731e6f2 Merge open155 > github/master
open155
open186
Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00