Commit graph

414 commits

Author SHA1 Message Date
Schwobaland
c0904f1942 Restrict creating organisations by user (#193)
* restrict creating organizations based on right on user

* revert bindata.go

* reverse vendor lib

* revert goimports change

* set AllowCreateOrganization default value to true

* revert locale

* added default value for AllowCreateOrganization

* fix typo in migration-comment

* fix comment

* add coments in migration
2016-12-31 10:33:30 +08:00
Andrey Nering
6069abe5fd Notifications - Step 2 2016-12-30 16:51:24 -02:00
Andrey Nering
b992858883 Tab on user profile to show starred repos (#519)
* Tab on user profile to show starred repos

* Make golint happy and use transactions on StarRepo function

* x -> sess

* Use sess.Close() instead of sess.Rollback()

* Add copyright

* Fix lint
2016-12-29 22:58:24 +08:00
Kjell Kvinge
22e1bd31c6 commithgraph / timeline (#428)
* Add model and tests for graph

* Add route and router for graph

* Add assets for graph

* Add template for graph
2016-12-29 07:44:32 +08:00
Bwko
331316894e Replace Gogs with Gitea (#520) 2016-12-28 16:33:21 +08:00
Avelino
d93429af8b Fixed project name on base template head 2016-12-02 07:48:11 +01:00
Bwko
5ab85372da Added rel="noopener" to target="_blank" hrefs (#327)
* Added rel="noopener" to target="_blank" hrefs

* Replaced gogs.io/docs with docs.gitea.io
2016-12-02 09:12:16 +08:00
Lunny Xiao
b339858500 replace footer gogs to gitea (#157) 2016-11-12 09:32:43 +01:00
Kim "BKC" Carlbäcker
562f9b6eae Merge all pagination-templates into 'base/paginate'
to reduce code-duplicity
2016-11-07 12:44:29 +01:00
Joubert RedRat
ff54e4d929 Set default less and css to new default name 2016-11-04 08:53:18 -02:00
Rémy Boulanouar
2d68bd1ef9 Change import reference to match gitea instead of gogs (#37) 2016-11-03 10:29:56 -02:00
Thibault Meyer
bc902b8f74 Feature #3492: Add option to hide footer load times (#3562)
* Add option to hide footer load times

* Rename option variable + minor changes
2016-09-01 01:01:32 -04:00
Unknwon
0114fdcba4 Web editor: improve delete file process 2016-08-28 01:41:44 -07:00
Unknwon
bbca2916f7 Update highlightjs 2016-08-27 11:56:20 -07:00
Richard Mahn
d0a0239bac Squashed commit of the following:
commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600

    Removed Upload stats as the upload table is just a temporary table

commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600

    Fix for CodeMirror mode

commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600

    Made tabbing in editor use spaces

commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600

    Fix for data-url

commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:42:53 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit 7fc8a89cb495478225b02d613e647f99a1489634
Merge: fd3d86c c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:40:00 2016 -0600

    Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file

commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:39:44 2016 -0600

    Code cleanup

commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 29 15:38:23 2016 -0600

    Code cleanup

commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:36:01 2016 -0600

    Code cleanup and fixes

commit c2895dc742f25f8412879c9fa15e18f27f42f194
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:24:04 2016 -0600

    Fixes per Unknwon's requests

commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef
Merge: 889e9fa ad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 17:13:43 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	modules/setting/setting.go

commit 889e9faf1bd8559a4979c8f46005d488c1a234d4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:09:18 2016 -0600

    Fix in gogs.js

commit 47603edf223f147b114be65f3bd27bc1e88827a5
Merge: bb57912 cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:07:36 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit bb5791255867a71c11a77b639db050ad09c597a4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:02:18 2016 -0600

    Update for using CodeMirror mode addon

commit d10d128c51039be19e2af9c66c63db66a9f2ec6d
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 16:12:57 2016 -0600

    Update for Edit

commit 34a34982025144e3225e389f7849eb6273c1d576
Merge: fa1b752 1c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 11:52:02 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go

commit fa1b752be29cd455c5184ddac2ffe80b3489763e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 15 18:35:42 2016 -0600

    Feature for editing, creating, uploading and deleting files
2016-08-14 23:52:24 -07:00
Sandro Santilli
3380c946e1 Always set redirect_to on header-provided sign-in (#3435)
This is an attempt to fix #3089 following the strategy introduced
in d625e41c6c, although that strategy
by itself does not seem to be sufficient.

What needs be done is honouring the redirect_url query parameter
from the auth router.
2016-08-11 10:14:39 -07:00
Unknwon
72dd299ca0 Update .gitattributes 2016-08-06 10:36:40 -07:00
rugk
28dc5bb566 Replace gogs.io http links with https version (#3386) 2016-08-05 17:35:40 -07:00
Unknwon
50422f1fc2 #3348 always use relative avatar link in the template 2016-08-05 12:12:54 -07:00
Unknwon
971e2c3bd6 Upgrade octicon to 4.3.0 2016-07-16 12:45:13 +08:00
Unknwon
326c982660 Upgrade frontend assets 2016-07-07 06:04:55 +08:00
Unknwon
7049cb9d97 Add new language support
- Update language choose dropdown to fit more languages
2016-04-25 13:40:23 -04:00
Kim Carlbäcker
b3c05026df [Feature/WIP] Confirm on editing forms (fixes #2881) (#2980)
* Add and start jQuery AreYouSure

* Update SimpleMDE to 1.10.1 for `forceSync` support

* Forgot to remove old version SimpleMDE 1.10.0

* formatting -.-
2016-04-19 16:45:28 -04:00
Odin Ugedal
01ff65a93e Fix indent 2016-03-15 22:35:59 +01:00
Odin Ugedal
a75fa58e1c Make description meta tag golang 1.4 compatible 2016-03-15 19:57:19 +01:00
Odin Ugedal
561e5f9ccb Set description meta tag correctly
Set the description meta tag correctly when there is no repo
description. Also use the  ability to trim trailing whitespaces,
to make the template cleaner.
2016-03-15 10:17:23 +01:00
Odin Ugedal
85d7afeba0 Set HTML meta values corresponding to repository
Use the authors name, and the description of the repo in HTML meta.
Pages without repository context will display as before.
2016-03-14 17:32:24 +01:00
Unknwon
2bf8494332 #13 finish user and repository search
Both are possible on explore and admin panel
2016-03-11 15:33:12 -05:00
Unknwon
0c9a616326 Update frontend resources 2016-03-07 00:11:12 -05:00
Andrey Nering
e40d94bb4f Implementing the "theme-color" meta tag.
Used by Android >= 5.0 to make the top bar colored.

Reference: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
2016-02-08 17:03:18 -02:00
Unknwon
8436d69eaf Update and reorganize front-end resources 2016-01-30 22:10:20 -05:00
Unknwon
ee814bf8d6 #2491 minor fix for sr on dashboard 2016-01-29 15:28:24 -05:00
Unknwon
4993ab1a76 #2185 fall back to use custom chardet lib 2015-12-31 22:13:47 -05:00
João Pedro
7bab3d682f Lowercase "Service" 2015-12-27 18:53:52 +00:00
João Pedro
34f01aab5e Update head.tmpl 2015-12-27 18:44:18 +00:00
Unknwon
71123c816d update hightlight.js 2015-12-13 00:58:30 -05:00
Adam Strzelecki
da2585c11e Indent all templates with tabs
This commit improves templates readability, since all of them use consistent
indent with all template command blocks indented too.

1. Indents both HTML containers such as <div>, <p> and Go HTML template blocks
   such as {{if}} {{with}}

2. Cleans all trailing white-space

3. Adds trailing last line-break to each file
2015-12-08 00:57:46 +01:00
Unknwon
2b10fdc4dc Wiki: UI for page new 2015-11-25 20:10:25 -05:00
Unknwon
7f9598141b fix #2020 2015-11-24 18:49:34 -05:00
Unknwon
b80e848d02 upgrade libs 2015-11-21 21:09:18 -05:00
Unknwon
4325b01a58 minor fix for #1992 2015-11-18 17:19:36 -05:00
Gibheer
56006da34b fix #1957 - disable version display
This allows the admin to disable the version information about gogs and
go in use in the footer.
2015-11-18 22:32:31 +01:00
Unknwon
7b1c10ea7e new repo ui
- copy link button: #1396, #1168, #1668,
- synxtax highlight: #1712, #1549, #1315, #670
- z-index: #1942
2015-11-14 04:34:01 -05:00
Unknwon
92535c9df0 update some libs 2015-11-02 02:00:12 -05:00
Nathan Zadoks
4323a89c03 Add go-source directive to repo pages
This makes Gogs repos work with godoc.org: https://github.com/golang/gddo/wiki/Source-Code-Links
2015-10-30 14:00:09 +01:00
Unknwon
4465c58f4b new quick start page 2015-10-02 19:58:36 -04:00
Unknwon
3fb1b6a608 drop oauth2 feature support 2015-09-17 16:11:44 -04:00
Unknwon
2729eb998c #1646 and other minor fixes 2015-09-16 15:34:46 -04:00
Unknwon
e4ecbcdf4a new sign in page 2015-09-14 22:50:44 -04:00
Unknwon
03ea29eb36 minor fix on icon 2015-09-07 15:03:31 -04:00
Unknwon
00767a0522 finish new org settings page 2015-09-06 11:25:08 -04:00
Unknwon
24658fcbdd #633 dix suburl 2015-09-06 06:57:25 -04:00
Unknwon
705224353b minor fix 2015-09-05 19:58:44 -04:00
Unknwon
3b0c2cb480 #633 Add Emoji support 2015-09-05 14:11:05 -04:00
Unknwon
d023e81a8f #1577 explore paginator problem 2015-09-04 05:54:22 -04:00
Unknwon
768c78d143 update semantic 2015-09-02 17:53:11 -04:00
Unknwon
83dc2468f5 finish initial version of pull request 2015-09-02 16:18:09 -04:00
Unknwon
f509c59ac1 new create webhook event 2015-08-28 23:36:13 +08:00
Unknwon
a7686e8749 #1203 bundle jquery with gogs 2015-08-28 14:24:05 +08:00
Unknwon
70e0153b93 add highlight js 2015-08-27 23:58:50 +08:00
Unknwon
f808df5a7b new user dahsboard issues 2015-08-25 22:58:34 +08:00
Unknwon
2493454587 new delete account UI and password confirmation 2015-08-19 02:49:44 +08:00
Unknwon
2e30b421b4 comletely remove v1 UI files of Gogs 2015-08-15 19:07:21 +08:00
Gogs
e43341f4c5 column belongs always into a ui grid 2015-08-12 13:17:24 +02:00
Unknwon
89c2bd4a0d finish create issue attachment UI 2015-08-11 17:54:00 +08:00
Unknwon
887bc1b594 Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
2015-08-10 23:01:41 +08:00
Unknwon
2aea247208 minor fix on #1460 2015-08-10 22:59:12 +08:00
Fernando San Julián
4cc198179c new top menu 2015-08-10 16:38:21 +02:00
Unknwon
17de3ab0a3 add migrate from issue.label_ids to issue_label 2015-08-10 14:42:50 +08:00
Unknwon
7372042441 list view: issue, label, milestone 2015-08-09 22:45:38 +08:00
Unknwon
39a3b768bc #334: Add Deployment Key Support 2015-08-06 22:48:11 +08:00
Unknwon
3e4cdccf6b milestone: create page 2015-08-05 15:24:26 +08:00
Unknwon
54b58e988d Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues 2015-07-25 00:49:40 +08:00
Unknwon
dc4aab9925 UI: CURD labels
- fix update lable break connection with repository
2015-07-24 23:13:42 +08:00
Unknwon
ac95f6d50f UI: basic label list
- create new label
2015-07-24 21:02:49 +08:00
Unknwon
86dbda0b42 UI: basci issue list without filters
- fix isRead check
- fix paging
2015-07-24 16:42:47 +08:00
Unknwon
4447a20f87 UI: issues - finish basic frame 2015-07-24 04:50:05 +08:00
Duncan
a6596f2231 Prevent browsers from leaking referrer headers 2015-07-21 15:19:56 +12:00
Unknwon
5cf3732339 UI: install - new version 2015-07-08 19:47:56 +08:00
Unknwon
5dd3dd71a0 UI: install - database settings 2015-07-08 01:09:03 +08:00
Unknwon
ffd17924fd update UI framework 2015-07-07 13:51:28 +08:00
Unknwon
2bb982dada #1080: Remove footer ads/branding from default template 2015-03-23 10:19:19 -04:00
Unknwon
b6f8b486c7 add sr-only class, change to new tag line 2015-03-20 03:20:05 -04:00
Unknwon
4b9fb43a70 home: new UI 2015-03-07 15:12:13 -05:00
Peter Smit
e6fc58a744 Remove GoGet option from repository and handle it with ?go-get=1 instead
The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
2015-02-17 10:36:17 +02:00
Unknwon
7ba9257a7f Add suburl support 2014-09-19 20:11:34 -04:00
Martin van Beurden
0055cbd365 Allow Gogs to run from a suburl behind a reverse proxy. e.g. http://mydomain.com/gogs/
Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
2014-09-18 20:50:48 +02:00
Unknwon
1aec1a2dda Finish new admin dashboard 2014-08-28 22:29:00 +08:00
Unknown
097c8e05e6 Able to set timeout for process monitor 2014-07-06 17:32:36 -04:00
Unknown
d952b4200c Add corn rask monitor panel 2014-06-13 13:01:52 -04:00
Unknown
5e9a45f74a Code convention 2014-05-21 21:37:13 -04:00
FuXiaoHei
16e162b669 issue label ui design 2014-05-16 16:00:09 +08:00
FuXiaoHei
2eabeba6b7 finish milestone add page 2014-05-09 22:33:07 +08:00
Unknown
c1eb4d894a Clean api code 2014-05-05 13:08:01 -04:00
Unknown
2a1dc0085b fix #91 2014-05-01 07:35:21 -04:00
Unknown
eb463000a9 Clean files 2014-05-01 03:27:26 -04:00
Unknown
49dc57e336 Add /api/v1/users/search 2014-04-30 23:48:01 -04:00
Unknown
48bfbb7ddf Mirror changes 2014-04-30 03:44:28 -04:00
Unknown
62d23e9154 HTTP no follow and offline mode 2014-04-27 01:05:13 -06:00
Unknown
59d0e73c35 Batch mirror fix 2014-04-26 22:34:48 -06:00
James Anderson
4b58c01603 Changed setting url to settings 2014-04-23 15:30:18 -04:00
Unknown
c3a52f7dd0 Mirror bug fix on downloading zip 2014-04-15 20:01:20 -04:00
Unknown
3c3cda7326 Weibo oauth 2014-04-14 05:07:19 -04:00
Unknown
c36e7d322e Mirror updates 2014-04-14 04:11:33 -04:00
Unknown
8c266f2df5 go get 2014-04-13 05:04:11 -04:00
Unknown
4c1452574a go get 2014-04-13 05:02:11 -04:00
Unknown
ea74be2f2e go get 2014-04-13 04:27:29 -04:00
Unknown
d26a333dfb go get 2014-04-13 04:08:25 -04:00
Unknown
90f6aa8cd1 Add repo mirror and import 2014-04-12 20:35:35 -04:00
Unknown
33aa4f7438 Support private repo 2014-04-11 21:47:39 -04:00
Unknown
7d07b58114 UPDATE README 2014-04-11 13:24:19 -04:00
Unknown
a5fcaae5ee UPDATE README 2014-04-11 12:26:23 -04:00
FuXiaoHei
555b6976a3 add search form in top navbar 2014-04-11 22:41:41 +08:00
Unknown
45462662e9 Add flash 2014-04-10 16:36:50 -04:00
Unknown
29e255422e Merge branch 'dev' of github.com:gogits/gogs into dev 2014-04-10 14:37:51 -04:00
Unknown
af552596cf Work on form resubmit 2014-04-10 14:37:43 -04:00
FuXiaoHei
a354f33ac2 new-repo dropdown in top navbar 2014-04-10 22:00:32 +08:00
Unknown
5d4025cb5a Add go get meta support 2014-04-09 21:42:25 -04:00
Unknown
115a349131 Fix #67 2014-04-08 12:41:33 -04:00
Unknown
cb05b8325c Update config option 2014-03-28 08:39:35 -04:00
FuXiaoHei
2a2f025388 change css name style 2014-03-25 18:44:37 +08:00
FuXiaoHei
62b05c1e22 top-nav sign-up btn change to text link 2014-03-25 00:02:16 +08:00
slene
076fc98d98 add csrf check 2014-03-23 01:44:02 +08:00
FuXiaoHei
85abe5132e fix navbar button ui 2014-03-21 21:36:15 +08:00
FuXiaoHei
ecc61ced41 update admin nav ui 2014-03-21 21:06:05 +08:00
Unknown
e4053f5e98 Mirror update 2014-03-21 06:47:24 -04:00
Unknown
369ddf76a8 Batch fix 2014-03-21 01:09:22 -04:00
Unknown
9f9cd6bfc6 Work on admin 2014-03-20 07:50:26 -04:00
FuXiaoHei
9bc06dc716 Merge remote-tracking branch 'origin/master'
Conflicts:
	routers/user/user.go
2014-03-19 22:23:46 +08:00
slene
199fdd0336 fork render 2014-03-19 22:21:03 +08:00
FuXiaoHei
c7660a81c6 Merge remote-tracking branch 'origin/master'
Conflicts:
	routers/user/user.go
2014-03-19 22:19:17 +08:00
FuXiaoHei
a0e73e2b54 top nav arrow update 2014-03-19 22:15:28 +08:00
slene
483cc31369 Revert "fork render"
This reverts commit 56af7e99a8.
2014-03-19 22:11:28 +08:00
Gogs
56af7e99a8 fork render 2014-03-19 21:58:51 +08:00
Unknown
fbd252c1cf Mirror fix 2014-03-18 18:31:54 -04:00
FuXiaoHei
24d91ecda8 ui and js update 2014-03-17 15:17:44 +08:00
FuXiaoHei
c101471bdf ui update, repo-assignment panic bug fix 2014-03-17 13:12:28 +08:00
slene
c9bf526be7 markdown & code style 2014-03-16 23:25:01 +08:00
Unknown
8de9517862 Mirror fix 2014-03-16 03:41:22 -04:00
Unknown
f174633b36 Clean code 2014-03-15 09:17:16 -04:00
slene
0791d01513 update tmpl 2014-03-15 20:40:26 +08:00
slene
06deed820d Add HomeLink and AvatarLink to User model. Please use .SignedUser in template. 2014-03-15 15:28:06 +08:00
Unknown
1ce17cce76 Add log.handle 2014-03-14 01:59:07 -04:00
FuXiaoHei
efa039a0f7 finish ssh key pages ui 2014-03-10 21:12:49 +08:00
FuXiaoHei
46687f391c ssh keys operation page ui 2014-03-10 16:54:52 +08:00
Unknown
a2a59f8ad1 Change /user/profile URL to /user/:username 2014-03-07 17:08:21 -05:00
Lunny Xiao
8e821c75d7 add publickey list 2014-03-07 11:34:41 +08:00
Unknown
90223dcfc4 Bug fix 2014-03-06 13:18:19 -05:00
Unknown
d8b92b4bc9 Merge branch 'master' of github.com:gogits/gogs
Conflicts:
	templates/user/signup.tmpl
2014-03-06 11:12:37 -05:00
Unknown
1249392c83 Finish register user 2014-03-06 11:10:35 -05:00
FuXiaoHei
4c1858c07b navbar active status 2014-03-06 23:14:45 +08:00
FuXiaoHei
9cd14f97c2 register js validation 2014-03-06 22:55:32 +08:00
FuXiaoHei
4b912b9ae6 signed-in dashboard and navbar changes 2014-03-06 21:33:17 +08:00
Unknown
e59f90b8fe Update 2014-03-03 19:03:08 -05:00
Lunny Xiao
fea660f1d7 merged 2014-03-03 23:24:29 +08:00
FuXiaoHei
39ac95e5a2 nav ui for user logged 2014-03-03 22:40:22 +08:00
Lunny Xiao
0632198a40 add create repository button 2014-03-03 09:52:12 +08:00
Lunny Xiao
c5132b87a6 finished signin and login 2014-03-02 22:25:13 +08:00
FuXiaoHei
ffe0ba562c ui for user/profile page, only skeleton 2014-03-02 21:47:55 +08:00
FuXiaoHei
ffcfd428b8 ui design for sign-in and sign-up page
add /login and /sign-up link for user signing
fix typo error
2014-03-02 15:31:06 +08:00
Unknown
d4728fafaf Able to config app name 2014-02-19 14:49:08 -05:00
Unknown
3eb1ab9e8b Add UI for register user 2014-02-17 18:38:50 -05:00
Unknown
b1c5adc2f2 Setup templates structure 2014-02-14 20:14:22 -05:00
Unknown
96b317d3ff Init commit 2014-02-12 14:54:09 -05:00