1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-29 09:31:50 +00:00
Commit Graph

12 Commits

Author SHA1 Message Date
Rokt33r
a05bba15e7 Merge branch 'dev'
* dev: (79 commits)
  version 0.2.1
  修正 - Member list, Team listのデザイン修正
  実装 - Team pageとPlanet pageにMember List表示
  実装 - PlanetHeaderにPrivate鍵表示
  Noteから外部Linkを開くときにBrowserを使う
  LogoutModal実装
  Contact Modal追加
  on Refactor... #4
  on Refactor... #3
  on Refactor... #2
  on Refactoring...
  test 0.2.0
  Fix: Personal Settingボターンを右にする。写真からまっすぐProfile pageに入れるようにする
  Add: Refresh button
  Fix: Design changed
  Fix: Disable pinch to zoom
  Fix: Preview button修正
  Fix: PlanetNavigatorのHome削除 & SnippetsとBlueprintsはToggleができるように
  Fix: minor features 設定ボタンアイコンの変更 削除Modalでcmd+enterの使用 検索バーデザイン
  Add: Log in / Sign upの時にエラーが出たらAlertを表示する Debug: Tray Icon, PopUpWindow, Menuがいつの間にか消える
  ...

Conflicts:
	src/browser/main/controllers/AppController.js
	src/browser/main/controllers/directives/SideNavController.js
	src/browser/main/controllers/states/AuthRegisterController.js
	src/browser/main/index.html
	src/browser/main/services/Modal.js
	src/browser/main/styles/app.css
	src/browser/main/styles/app.styl
	src/browser/main/styles/directives/side-nav.styl
	src/browser/main/tpls/directives/side-nav.tpl.html
	src/browser/main/tpls/states/home.tpl.html
2015-08-21 04:58:01 +09:00
Rokt33r
d20f005c5d apply electron & cleanup old app files 2015-07-28 23:35:21 +09:00
Rokt33r
3b907627f7 fix links 2015-07-03 18:35:10 +09:00
Rokt33r
2284fd41b9 add agreement 2015-07-03 16:41:42 +09:00
Rokt33r
1a832c1fc4 rename api routes 2015-06-25 23:19:45 +09:00
Rokt33r
ee139ca36d update popup and set stage api 2015-06-25 21:01:57 +09:00
Rokt33r
549ce7f299 add How-to & Signout modal 2015-06-25 20:31:38 +09:00
Rokt33r
c72b5449bd clean up recipe 2015-06-25 19:28:36 +09:00
Rokt33r
debfa6323b update recipe states 2015-06-24 20:39:36 +09:00
Rokt33r
0e6fe35ca4 add Recipes(scaffolding) 2015-06-23 19:18:00 +09:00
Rokt33r
7c2cbfb32e fix injector bug & add tray-icon 2015-06-22 12:20:16 +09:00
Rokt33r
25eccacb4c refactor build config 2015-06-21 02:40:06 +09:00