Commit Graph

306 Commits

Author SHA1 Message Date
Mo Bitar
9ad020d682 Merge pull request #111 from aaronraimist/add-bower
Add Bower to list of devDependencies
2017-04-27 08:42:48 -05:00
Aaron Raimist
01e25d0026 Add Bower to list of devDependencies 2017-04-27 01:20:44 -05:00
Mo Bitar
674e7c8538 save editor when activated 2017-04-26 13:00:26 -05:00
Mo Bitar
fc53fdcb8b analytics menu 2017-04-25 11:45:04 -05:00
Mo Bitar
f982f0b00a save to local even if ongoing sync, alert user if sync is taking too long 2017-04-25 09:51:46 -05:00
Mo Bitar
0dc90551a3 Merge pull request #107 from standardnotes/conflicts
auto delete conflicts and show conflict flag
2017-04-21 11:21:56 -05:00
Mo Bitar
6793008892 remove conditional 2017-04-21 11:21:28 -05:00
Mo Bitar
ea77ef99bf auto delete conflicts and show conflict flag 2017-04-21 11:19:14 -05:00
Mo Bitar
ad92c0894d editor themes 2017-04-20 09:42:59 -05:00
Mo Bitar
0fcd439736 analytics 2017-04-18 18:35:00 -05:00
Mo Bitar
db4080924e url encode email in sf dashboard link 2017-04-18 12:16:52 -05:00
Mo Bitar
71f7189528 url encode get params 2017-04-18 09:46:52 -05:00
Mo Bitar
222d88112b Merge pull request #104 from standardnotes/default-editor
Default editors
2017-04-17 08:48:19 -05:00
Mo Bitar
8fa181fca6 sys editor comment 2017-04-15 11:21:36 -05:00
Mo Bitar
ee13af5726 add editor fix 2017-04-15 11:20:23 -05:00
Mo Bitar
5a98d44681 default editors 2017-04-15 11:10:59 -05:00
Mo Bitar
d538de192f bower 2017-04-10 15:38:34 -05:00
Mo Bitar
85d6d08996 Merge pull request #103 from standardnotes/themes
Web themes
2017-04-10 15:29:02 -05:00
Mo Bitar
37bc4e7204 css tweak 2017-04-10 15:13:31 -05:00
Mo Bitar
fd8e577018 rm unused 2017-04-10 15:07:15 -05:00
Mo Bitar
5e722e5291 web themes 2017-04-10 15:05:13 -05:00
Mo Bitar
7a814eb122 Merge pull request #92 from standardnotes/ivs
002 encryption type
2017-03-18 15:52:11 -05:00
Mo Bitar
70c23973b2 merged master 2017-03-18 15:50:19 -05:00
Mo Bitar
bb459810f4 Merge branch 'master' of github.com:standardnotes/web into ivs 2017-03-18 15:48:42 -05:00
Mo Bitar
0294b0a093 check ext response before adding 2017-03-18 09:56:37 -05:00
Mo Bitar
9ce291722d full screen fix 2017-03-16 16:24:32 -05:00
Mo Bitar
9a48a28cb1 editor css 2017-03-16 15:51:12 -05:00
Mo Bitar
6ca0811f98 removed important from css 2017-03-16 15:33:49 -05:00
Mo Bitar
53b51bbfbd Merge pull request #99 from standardnotes/prompt-fix
Remove pw confirm prompt with UI prompt
2017-03-13 11:39:46 -05:00
Mo Bitar
17d1897e71 Remove pw confirm prompt with UI prompt 2017-03-13 11:35:37 -05:00
Mo Bitar
ef76db5e7e fixes firefox tag selection issue 2017-03-10 15:04:46 -06:00
Mo Bitar
39e5bbf966 minor css 2017-03-10 14:34:27 -06:00
Mo Bitar
f05ddb5cd1 fixes change editor glitch 2017-03-10 14:31:17 -06:00
Mo Bitar
a8eab8aab7 fixes #93 2017-03-10 14:13:04 -06:00
Mo Bitar
3ca8d0c94c Merge branch 'tags-menu' 2017-03-10 14:08:42 -06:00
Mo Bitar
4d95e6070e fixes tags cutoff 2017-03-10 14:08:08 -06:00
Mo Bitar
3ce9af31ec Merge pull request #95 from standardnotes/tags-menu
Tags menu
2017-03-10 11:56:55 -06:00
Mo Bitar
f9c01c0488 Tags menu 2017-03-10 11:54:36 -06:00
Mo Bitar
c2654756ef remove log 2017-03-09 20:07:46 -06:00
Mo Bitar
bc0e76c7da fixes hex encoding issue 2017-03-09 20:07:28 -06:00
Mo Bitar
23611c31ae clear auth hash depending on version 2017-03-09 18:01:57 -06:00
Mo Bitar
2a8bc1a0b4 002 encryption type with ivs and auth hash 2017-03-09 17:39:54 -06:00
Mo Bitar
c36390dbc0 ivs wip 2017-03-08 18:15:56 -06:00
Mo Bitar
a6aa65d47b customized lodash build 2017-03-01 18:50:43 -06:00
Mo Bitar
6e77676f59 Merge pull request #86 from standardnotes/no-router
remove ui-router dependency
2017-03-01 18:33:12 -06:00
Mo Bitar
f54c7ea5cf remove ui-router dependancy 2017-03-01 18:31:59 -06:00
Mo Bitar
5169e3f0ee Merge pull request #81 from standardnotes/no-rest
remove restangular as dependency, use xmlhttprequest
2017-03-01 18:07:52 -06:00
Mo Bitar
e029b7c1a4 merged master 2017-03-01 17:52:37 -06:00
Mo Bitar
f7f0522f70 fix on note delete, select first 2017-03-01 17:44:20 -06:00
Mo Bitar
86c0ce3b9f Merge pull request #67 from amtsh/after-delete-select-first
After deleting a note, it should select the first note on top
2017-03-01 17:37:20 -06:00