status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
446 Commits 23 Branches 35 Tags 26 MiB
Commit Graph

446 Commits

Author SHA1 Message Date
Cheng-Han, Wu baa946968d Add db migrations for PR #121 2016-05-15 12:20:42 +08:00
Cheng-Han, Wu 93c6205aa6 Fix merge conflicts 2016-05-15 11:17:02 +08:00
Cheng-Han, Wu b956ada24b Merge branch 'jccrofty30-gitlab_snippets' 2016-05-15 11:15:02 +08:00
Cheng-Han, Wu 8a01b7242c Merge branch 'gitlab_snippets' of https://github.com/jccrofty30/hackmd into jccrofty30-gitlab_snippets 
# Conflicts:
#	lib/response.js
 2016-05-15 11:02:15 +08:00
Cheng-Han, Wu 22f7c4bdcb Merge branch 'jccrofty30-gitlab_authentication' 2016-05-15 10:58:53 +08:00
Cheng-Han, Wu 73835763c6 Merge PR #118 2016-05-15 10:58:41 +08:00
Cheng-Han, Wu a70ebf7762 Update to move dropbox app key setting to common.js and will auto load client-side related scripts 2016-05-15 10:54:24 +08:00
Cheng-Han, Wu a816420302 Merge branch 'janniklorenz-master' 2016-05-15 09:56:15 +08:00
Cheng-Han, Wu 217e683422 Merge PR #101 2016-05-15 09:56:01 +08:00
Jason Croft 930afdc337 Show only projects where user is creator, has project access >= 20, or has group access. 2016-05-13 10:32:30 -04:00
Jason Croft edcb766b63 Apply "snippets_enabled only" logic to import modal. 
Better parsing for snippet import.
Add python filetype.
 2016-05-13 10:00:34 -04:00
Jason Croft c4b754e53b Add avatar to History page. 2016-05-12 15:21:05 -04:00
Jason Croft ba0a8f584a Filter out projects that don't have snippets enabled. 2016-05-12 14:26:55 -04:00
Jason Croft 31d978e450 Revert last change. 2016-05-12 14:26:43 -04:00
Jason Croft d6316a24c9 Only pull projects the user owns. 2016-05-12 14:18:36 -04:00
Jason Croft 0adc0864d5 Retrieve GitLab avatar. 2016-05-12 13:26:50 -04:00
Jason Croft b96cc4eb94 Retrieve GitLab avatar. 2016-05-12 13:26:28 -04:00
Jason Croft e65d43bd81 Merge remote-tracking branch 'origin/master' into gitlab_snippets 
# Conflicts:
#	bower.json
#	public/views/body.ejs
 2016-05-12 12:32:10 -04:00
Jason Croft 30e602a740 Enable snippet exporting. 2016-05-12 12:28:08 -04:00
Jason Croft c16345ab12 Can now select from available projects and snippets to build import URL. 2016-05-12 11:19:14 -04:00
Jason Croft de998c4a0f Check to make sure GitLab is configured before showing import option. 2016-05-11 21:12:48 -04:00
Jason Croft a3876dfc92 Start extending to support GitLab authentication. 
Add necessary dependency.
Add baseURL parameter for self-hosted GitLab
Add necessary require.
Add block for GitLab auth.
Fix typo
Update font-awesome dependency for GitLab icon.
Use a color closer to GitLab orange.
More direct TODO
 2016-05-11 21:02:53 -04:00
Jason Croft ad79b581bd End-point to get GitLab data. 2016-05-11 17:06:18 -04:00
Jason Croft e545de72a6 Add accessToken saving. 2016-05-11 17:06:05 -04:00
Jason Croft 9f401b3fa8 Fully-fleshed snippetImportModal 2016-05-11 17:05:53 -04:00
Jason Croft 3dd3e6bc35 Allow importing from GitLab snippet 2016-05-11 17:05:25 -04:00
Jason Croft 17daf32239 Remove skeleton functions 2016-05-11 17:04:55 -04:00
Jason Croft a443490ee6 Add accessToken column 2016-05-11 17:04:45 -04:00
Cheng-Han, Wu 4aa4e3eacc Add help and help modal with contacts, documents, cheatsheet 2016-05-11 14:37:54 +08:00
Cheng-Han, Wu 79b37c4fb2 Update font-awesome to 4.6.2 2016-05-11 14:33:12 +08:00
Cheng-Han, Wu a1cbdb6de7 Try to fix potential toolbar layout glitch 2016-05-11 11:47:39 +08:00
Jason Croft 70f6e5bc2c Define events for snippet actions 2016-05-09 22:38:13 -04:00
Jason Croft 17d2249ec3 Define snippet import modal 2016-05-09 22:37:51 -04:00
Cheng-Han, Wu f18ce47a3d Update to exit app when an uncaughtException occured. 2016-05-10 09:37:41 +08:00
Jason Croft 521f96fb11 Skeletons for GitLab actions. 2016-05-09 17:07:23 -04:00
Jason Croft 476cabd109 Attach to snippet classes. 2016-05-09 17:07:02 -04:00
Jason Croft 277bf60a2e Add GitLab options. 2016-05-09 17:06:44 -04:00
Jason Croft 079822dfec Start extending to support GitLab authentication. 
Add necessary dependency.
Add baseURL parameter for self-hosted GitLab
Add necessary require.
Add block for GitLab auth.
Fix typo
Update font-awesome dependency for GitLab icon.
Use a color closer to GitLab orange.
More direct TODO
 2016-05-09 16:27:35 -04:00
Cheng-Han, Wu 8e8a5e1ecb Fix possible glitch of layout 2016-05-09 17:52:03 +08:00
Cheng-Han, Wu 3b5e74c9c4 Workaround imgur api only provide non-https image url which will cause mix-content warning in browsers 2016-05-08 01:54:57 +08:00
Cheng-Han, Wu 7aa21c8f19 Fix missusing for CodeMirror.Pass 2016-04-28 11:10:09 +08:00
Cheng-Han, Wu efb188c9c1 Fix code styles 2016-04-24 12:30:16 +08:00
Cheng-Han, Wu 0bb3e53d58 Change fullScreen toggle to F10 
because Mac OS X default might overwrite F11 and F12 behaviors
 2016-04-24 12:29:55 +08:00
Cheng-Han, Wu b1187a2014 Fix some indentation 2016-04-24 11:03:57 +08:00
Cheng-Han, Wu 42ac80eb0e Fix other CodeMirror.Pass usage 2016-04-24 10:49:22 +08:00
Max Wu 9418e446b1 Merge pull request #102 from Zankio/master 
Fix Esc key in Vim mode
 2016-04-24 10:42:52 +08:00
Zankio 3aa9204e57 Fix Esc in Vim mode 2016-04-23 23:35:23 +08:00
Jannik Lorenz 55a1ba0699
Fix google drive config 2016-04-23 14:34:15 +02:00
Jannik Lorenz 404e44649f
Fix error page (missing googleDrive config) 2016-04-23 14:15:24 +02:00
Jannik Lorenz d7648e9cea
Hide Dropbox and Google Drive in Import/ Export when disabled 2016-04-23 12:58:24 +02:00