Unknwon
7dbb98b2a3
add new locale
2015-03-14 22:21:45 -04:00
Nolan Darilek
25dd6f8fa0
Add additional accessibility text to repository navbar.
2015-03-14 12:30:14 -05:00
Nolan Darilek
37ab32b613
Various accessibility fixes, mostly labeling icons.
2015-03-14 09:55:04 -05:00
Unknwon
96a95e9dfd
#988 : fix one missing duplicated prefix
...
- update some locale files
2015-03-13 15:41:51 -04:00
Unknwon
48bb639371
Merge branch 'develop' of github.com:gogits/gogs into develop
2015-03-12 16:01:41 -04:00
Unknwon
0720d3988f
#988 : GetRepoLink already contains AppSubUrl
2015-03-12 16:01:23 -04:00
Nolan Darilek
98674b2a21
registeration -> registration
2015-03-12 12:25:28 -05:00
Unknwon
4b9fb43a70
home: new UI
2015-03-07 15:12:13 -05:00
Unknwon
e3d73d9b24
conf/locale: update locales
2015-03-04 18:19:32 -05:00
无闻
3db80f2c55
Merge pull request #943 from diseaz/mailer-client-cert
...
Use client certificate for SMTP over TLS
2015-02-28 22:25:48 -05:00
Unknwon
a6a2f59d1d
Merge branch 'access' of github.com:gogits/gogs into dev
2015-02-28 22:25:10 -05:00
Unknwon
d446be9f5f
models: mirror fix on #964
2015-02-28 22:24:53 -05:00
Unknwon
0d90a16d9f
conf/locale: update Russian and Spanish
2015-02-28 06:45:08 -05:00
无闻
cd8b43d984
Merge pull request #915 from Lafriks/dev
...
Get username, name, surname and e-mail from LDAP server
2015-02-23 13:41:29 -05:00
Unknwon
059338139c
routers: able to migrate repo from local path
...
- modules/middleware/context.go: add HandleAPI method
2015-02-22 09:49:25 -05:00
Unknwon
1654e9ecab
templates/user/settings/emial.tmpl: little fix on UI
...
- routers/user: little code format
- conf/locale: update French locale
2015-02-21 22:13:47 -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
def39d191b
conf/locale: update all locales
2015-02-13 15:48:10 -05:00
Dmitry Azhichakov
2692d4aa49
Make conf/app.ini changes match the style
2015-02-13 11:06:12 +03:00
Dmitry Azhichakov
3aaf292ba8
Fix "forcing" client certificate for SMTP
2015-02-13 10:33:55 +03:00
Unknwon
d02e45f985
better naming on #891
2015-02-11 12:04:01 -05:00
Unknwon
6a23252edc
able to allow insecure certification of webhook for #891
2015-02-10 21:06:59 -05:00
Unknwon
7d3932b9cd
templates/ng/base: change year to 2015, fix #928
...
- conf/locale: update Japanese locale
2015-02-09 11:04:17 -05:00
Unknwon
f15fa9167a
cmd: code fix for #905
...
- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)
2015-02-08 21:26:14 -05:00
Unknwon
775bd65234
conf/locale: add Spanish locale
2015-02-08 12:39:11 -05:00
Lauris BH
00653e52ee
Get username, name, surname and e-mail from LDAP server
2015-02-08 01:49:51 +02:00
Unknwon
f989805050
conf/locale: update locales
2015-02-07 11:12:13 -05:00
Unknwon
2a2596fe61
able to disable SSH for #883
2015-02-07 10:46:57 -05:00
Unknwon
3f2e99962c
conf/locale: update French locale
2015-02-06 21:29:15 -05:00
无闻
87b90372a7
Merge pull request #908 from nicolai86/feature/hide-signup-button-884
...
Make Signup button display configurable - #884
2015-02-06 21:03:31 -05:00
Unknwon
0669897226
modules/base: fix markdown mention regex for #826
...
- conf/locale: add mew translator profile
2015-02-06 19:15:58 -05:00
Raphael Randschau
92036a78d1
Add locales (en/de native, rest -> translate.google.com)
2015-02-05 18:15:00 +01:00
Unknwon
57291d1e2a
conf/locale: update Japanese locale
2015-02-02 09:44:51 -05:00
Unknwon
956c59b282
conf/locale: update Japanese locale
2015-02-02 07:33:24 -05:00
Unknwon
0a2068d7fb
models: code fix on #818
2015-02-01 17:21:56 -05:00
无闻
cd6376f093
Merge pull request #818 from fzerorubigd/master
...
add a function to rewrite all public keys on admin request
2015-02-01 16:56:34 -05:00
Miguel de la Cruz
b8425ccbec
Add Miguel de la Cruz as a translator
2015-02-01 22:47:58 +01:00
Unknwon
ac29dc93cd
conf/locale: add Japanese support
...
README: remove duplicated travis badge
2015-02-01 13:36:40 -05:00
Unknwon
b293b6eaa6
cmd: CMD option for port number of gogs web
to prevent first time run conflict
...
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
2015-02-01 12:41:03 -05:00
Unknwon
32152d2363
routers/repo: set raw page content type to 'text/plain' #828
2015-01-31 15:27:57 -05:00
Unknwon
37fcc8daf2
modules/base: add RenderCommitMessage with XSS-safe and special links
...
- update russian locale
2015-01-30 18:05:20 -05:00
Unknwon
c0e9481fa6
update locale
2015-01-26 09:13:34 -05:00
Unknwon
077d1ae70b
update locale
2015-01-23 00:46:48 +08:00
Unknwon
0e286a0ca9
fix locale
2015-01-19 02:51:43 +08:00
Unknwon
9fa287e4f7
update locale
2015-01-18 22:24:20 +08:00
Unknwon
7170011f4d
update with deps
2015-01-17 15:17:53 +08:00
Dominik Schulz
50d91f3b6a
Make help text for email listing a little more helpful.
2015-01-09 17:55:09 +01:00
Dominik Schulz
7d4cef6008
Add missing translations for email settings page to de_DE.
2015-01-09 17:54:44 +01:00
Unknwon
c73e9057ae
Optmize git-fsck options and fix #820
2015-01-02 20:14:43 +08:00
fzerorubigd
6643647687
add afunction to rewrite all public keys on admin request
...
refs #763
2015-01-01 02:15:52 +03:30
Peter Smit
8b31be43c6
Forgot to i18n "Primary"
2014-12-22 09:41:29 +02:00
Peter Smit
21dbcb7c77
Create English locale keys for multiple e-mails feature
...
Also, change all current 'emails' to 'e-mails'.
Still todo: some CSS for the user/settings/email page, but that is not my specialty
2014-12-22 09:11:30 +02:00
无闻
030b3d751e
Merge pull request #766 from phsmit/correct_from
...
Correct usage of FROM in email creation
2014-12-21 01:55:28 -05:00
Unknwon
79537467da
mirror fix and update
2014-12-20 22:51:16 -05:00
Peter
c884ecfea1
Parse the from string to extract the email address
2014-12-19 23:06:03 +02:00
Peter
2321b4b272
Change from header in email, fixes #765
2014-12-19 22:33:17 +02:00
Unknwon
b231b8c927
update locale and mirror code format
2014-12-19 00:24:17 -05:00
Peter
87be137b88
Rewrite of SendMail function
...
The SendMail function is rewritten and has the following new functionality:
- It is optional to skip verification of keys. The config option SKIP_VERIFY is added
- If the port is 465, or ending on 465, the TLS(/SSL) connection is started first.
2014-12-18 13:34:30 +02:00
Unknwon
792ec63c8a
update locale
2014-12-14 22:47:09 -05:00
Unknwon
9ac940d31d
update locales
2014-12-13 20:06:50 -05:00
Unknwon
ac4a10456e
api: able to create repo and fix #726
...
- POST /user/repos
- POST /org/:org/repos
2014-12-12 20:30:32 -05:00
Unknwon
2f3a7e53cb
fix #735
2014-12-12 01:29:36 -05:00
Unknwon
bc8721fb6c
Finish new UI for release page
2014-12-10 16:37:54 -05:00
Unknwon
9a1fe801e5
fix #711
2014-12-09 02:18:25 -05:00
Unknwon
6f71632e3e
new language
2014-12-07 19:27:49 -05:00
Unknwon
47e7175b80
upload locales
2014-12-05 18:27:59 -05:00
Unknwon
069486d169
fix #165
2014-12-05 17:54:57 -05:00
Unknwon
d75013a0e8
fix #580
2014-11-30 02:26:29 -05:00
Unknwon
d6132aaa88
fix oauth2
2014-11-28 21:20:13 -05:00
James Cracknell
ca09a0b516
Added comments documenting how to export SSL keys from .pfx
2014-11-27 14:42:06 -07:00
Unknwon
54d25c13d7
Fix #543
2014-11-24 18:47:59 -05:00
Unknwon
dc53270da9
Fix 653
2014-11-22 10:22:53 -05:00
Unknwon
ef275ebf62
more on change avatar
2014-11-21 12:51:36 -05:00
Unknwon
55dfe2c978
custom avatar upload
2014-11-21 10:58:08 -05:00
Unknwon
2d8c414f8c
Fix #635
2014-11-18 19:05:33 -05:00
Unknwon
32dcaefafa
fox #620
2014-11-17 14:53:41 -05:00
Unknwon
340a4595dd
support duoshuo mirror of gravatar
2014-11-16 20:27:04 -05:00
Unknwon
9e22840483
fix #622
2014-11-13 05:27:01 -05:00
Unknwon
8c9338a537
add personal access token panel #12
2014-11-12 06:48:50 -05:00
Unknwon
4f360d8f08
Fix #617 and update Germeny locale
2014-11-11 15:30:11 -05:00
Unknwon
e0de6cb5ad
work on #616 and update locales
2014-11-10 05:30:07 -05:00
Unknwon
ff8578082e
update locale files
2014-11-07 17:07:36 -05:00
Unknwon
23eec25274
Fix #605 , fix #255 , fix #101
2014-11-06 22:06:41 -05:00
Unknwon
4e7eb5be9d
Work on #5 fork and fix #608
2014-11-05 23:30:04 -05:00
Unknwon
b375192352
fix tpl error
2014-11-04 12:07:43 -05:00
Unknwon
0c5ba4573a
fix session API broken and SQL pretection
2014-11-04 11:37:15 -05:00
Unknwon
283c81316c
locale fix
2014-11-01 21:43:53 -04:00
Unknwon
c7f56d7483
Fix #584
2014-10-27 11:18:00 -04:00
Tony Tsang
885833892f
Updated locale zh-HK
2014-10-14 17:04:45 +08:00
Unknwon
4a8a70dde0
Fix gzip
2014-10-13 18:04:07 -04:00
Unknwon
452ccff81c
Mirror fix on add ssh key
2014-10-11 21:04:42 -04:00
Unknwon
963354c5d7
Add raw, history file button, and other mirror fixes
2014-10-11 18:02:48 -04:00
Unknwon
3600498c8f
Add push tag action
2014-10-10 21:58:13 -04:00
Unknwon
b2632dec09
Page: Compare 2 commits
2014-10-10 21:40:51 -04:00
Unknwon
41dbb4c148
Hide org member in collar page
2014-10-10 06:15:27 -04:00
Unknwon
85c9f7c5f3
Issue: Show error prompt when add repository to team and it does not exist #533
2014-10-10 05:06:12 -04:00
Tony Tsang
8c71ab5094
Add locale zh-HK (Traditional Chinese)
2014-10-10 14:17:47 +08:00
Unknwon
1aa76bd279
Fix #532 , add system notice
2014-10-08 18:29:18 -04:00
Unknwon
64c68220d2
Fix #264
2014-10-06 17:50:00 -04:00
无闻
810ff480b8
Merge pull request #531 from basilfx/dev
...
Updated Dutch translations
2014-10-05 18:09:34 -04:00
无闻
de65c30770
Merge pull request #530 from chk1/master
...
Add and translate missing German strings for user page
2014-10-05 18:09:19 -04:00
Bas Stottelaar
bbf5bcdf99
Updated Dutch translations
...
Fixed some spelling mistakes.
* Number up to 20 are written as words instead of digits.
* Nouns are written without spaces.
* Fixed mixups between informal/formal language.
* Removal of extra spaces in sentences.
2014-10-05 21:03:07 +02:00
unknown
02b53aff0f
Add and translate missing German strings for user page
2014-10-05 17:26:32 +02:00
无闻
6a79b76531
Merge pull request #529 from chk1/master
...
Translate missing entries & add German translation to homepage
2014-10-04 15:56:43 -04:00
unknown
8c70bcee99
Translate missing strings and some improvements
2014-10-04 21:32:55 +02:00
Michael Boke
29a7d1ce61
updated some strange translated message so they will match their context on the website
2014-10-04 10:32:31 +02:00
Michael Boke
500b8a2a0f
updated translations with the latest master version
2014-10-04 10:22:03 +02:00
Michael Boke
ba1270df2d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
conf/app.ini
2014-10-03 22:51:07 +02:00
Michael Boke
ba0feadc34
Added dutch translations
2014-10-03 22:43:42 +02:00
Sebastian Jackel
1601b27ad3
Added some missing strings under the [action] category to german localization
2014-10-01 14:47:34 +02:00
Unknwon
a046a31d2b
UI: Confirmation box
2014-09-29 18:52:28 -04:00
Unknwon
49193bebd2
UI: Confirmation box
2014-09-28 01:38:25 -04:00
Unknwon
ad2ab6d214
Add modal to change username
...
Signed-off-by: Unknwon <joe2010xtmf@163.com>
2014-09-26 22:33:30 -04:00
Unknwon
10673417dc
Mirror fix on transfer repo
2014-09-25 22:42:31 -04:00
Unknwon
71e4689d11
Page: User profile
2014-09-25 19:33:39 -04:00
Unknwon
f69761563b
Fix bug on transfer repo
2014-09-25 16:36:19 -04:00
Cedric Ziel
b0f8b1147c
[TASK] Refine german string for authentification source
2014-09-25 09:16:43 +02:00
Unknwon
5bbeeb0f1b
Page: Commits and fix #249
2014-09-23 15:30:04 -04:00
Unknwon
a1109e6fbc
Page: Repository home page
2014-09-23 13:47:54 -04:00
无闻
b92cac7038
Merge pull request #496 from domnikl/patch-1
...
fixed typos and English phrases in German translation
2014-09-23 09:56:26 -04:00
Dominik Liebler
de2a4f8f83
fixed typos and English phrases
...
fixed Typo "Hilef"
2014-09-23 13:15:52 +02:00
Unknwon
135d3733b3
Feature: Integrate crypto/tls/generate_cert.go command
2014-09-22 17:30:58 -04:00
Unknwon
063aacd436
UI: Use tooltip not alert when copy clone URL
2014-09-22 14:47:47 -04:00
fanningert
052ab30409
Update locale_de-DE.ini
2014-09-20 11:01:05 +02: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
a596388ebf
Add success message after transfer repository #481
2014-09-17 14:52:46 -04:00
Unknwon
8a09256941
Mirror fix and fix #481
2014-09-17 14:22:51 -04:00
lunnyxiao
061a879cea
Merge branch 'dev' of github.com:gogits/gogs into dev
...
Conflicts:
conf/app.ini
2014-09-17 12:04:18 +08:00
lunnyxiao
ed84adb679
toutf8 improved & add max git diff lines
2014-09-17 12:03:03 +08:00
Philippe Barsalou
bc3abb397f
typos
2014-09-16 20:58:17 -04:00
Philippe Barsalou
9e10304ab2
started french localization
2014-09-16 20:58:17 -04:00
Unknwon
b9560374cd
UI fix
2014-09-13 22:12:11 -04:00
Mathieu Gagnon
3549fb0ea8
Remove APP_LOGO setting
2014-09-13 03:52:51 -04:00
Unknwon
cfed11f092
Bug: Transfer repository doesn't update the count
2014-09-12 18:29:58 -04:00
无闻
b92384020c
Merge pull request #435 from tstorch/translation-update
...
Small German update
2014-09-07 23:53:59 -04:00
Unknwon
f8977f4847
Organization level webhooks
2014-09-07 19:39:26 -04:00
无闻
e79e4b1580
Merge pull request #442 from compressed/org_hook
...
Organization-level Webhooks
2014-09-07 19:30:51 -04:00
Unknwon
0ddb1eb769
Finish new install page, almost ready for 0.5 release
2014-09-07 19:02:58 -04:00
Unknwon
ab7206d6b7
Fix #348
2014-09-05 17:28:09 -04:00
Christopher Brickley
85c35a6b8b
add organization-level webhooks
2014-09-05 07:19:34 -04:00
Christopher Brickley
8d2fe064c5
modify grammar undo -> undone
2014-09-05 07:19:33 -04:00
Tristan Storch
000b906259
Small German update
...
Cleaning up a misunderstanding I had.
2014-09-03 16:58:23 +02:00
Arpemedia
0730ec4087
Fix grammar error in German translation
2014-09-02 13:46:18 +02:00
Tristan Storch
7b310b1abb
German laguage update
...
What has been done:
- standardized expressions
- shorter and clearer
- minor corrections (orthography)
2014-08-31 19:29:03 +02:00
fanningert
1858d2066b
Add new translation keys
2014-08-31 18:48:24 +02:00
无闻
3e740278bd
Merge pull request #407 from fanningert/patch-3
...
Update locale_de-DE.ini and correct a wrong translation
2014-09-01 00:36:23 +08:00
Unknwon
c5ce33047e
Mirror fix and hide missing pages for 0.5 release
2014-09-01 00:33:40 +08:00
fanningert
801fc536f2
Update locale_de-DE.ini
2014-08-31 18:05:26 +02:00
fanningert
99e009665c
Update locale_de-DE.ini
2014-08-31 18:04:15 +02:00
fanningert
72ec3e8da0
Update locale_de-DE.ini
2014-08-31 18:03:28 +02:00
Christopher Brickley
2bce24068d
add Slack API webhook support
2014-08-31 12:01:59 -04:00
fanningert
9554ad514e
Change "Repositories" to "Repositorys"
2014-08-31 17:59:22 +02:00
fanningert
df3621e050
Update locale_de-DE.ini and correct a wrong translation
2014-08-31 17:30:53 +02:00
fanningert
80447f1168
Update german translation with PR #404
2014-08-31 16:10:02 +02:00
fanningert
c30063eefb
Update locale_de-DE.ini
2014-08-31 15:18:29 +02:00
Unknwon
676bd764fa
UI: SSH/HTTPS address switch and copy
2014-08-31 21:03:16 +08:00
无闻
d78008b546
Merge pull request #396 from fanningert/patch-1
...
Update locale_zh-CN.ini
2014-08-31 11:30:13 +08:00
无闻
1d6df04ecb
Merge pull request #397 from fanningert/patch-2
...
Update locale_en-US.ini
2014-08-31 11:30:02 +08:00
fanningert
5cdecd74c7
Update locale_de-DE.ini
2014-08-30 22:29:23 +02:00
fanningert
85e01bfe01
Update locale_en-US.ini
...
Double entry of "config.log_config"
2014-08-30 22:28:43 +02:00
fanningert
73ddf401ee
Update locale_zh-CN.ini
...
Double entry of "config.log_config"
2014-08-30 22:28:03 +02:00
Tristan Storch
69e332f432
Removed trailing white spaces
...
Removed trailing whitespaces with
```sh
for file in `grep -r " $" * | cut -d : -f 1 | sort | uniq | grep -v " "`; do sed -i 's/[ \t]*$//' $file; done
```
and some handwork.
2014-08-30 15:12:53 +02:00
Unknwon
9bc63bda7d
Finish all new admin pages.
2014-08-30 20:49:51 +08:00
无闻
66d51804c9
Merge pull request #391 from fanningert/patch-1
...
Update locale_en-US.ini
2014-08-30 04:30:35 -07:00
fanningert
272d387c0c
Update locale_de-DE.ini
2014-08-30 12:48:14 +02:00
fanningert
32760ba49d
Update locale_en-US.ini
2014-08-30 12:47:51 +02:00
无闻
08dbf08d39
Merge pull request #386 from fanningert/patch-2
...
Update locale_de-DE.ini
2014-08-29 05:53:48 -07:00
Unknwon
d2aff9a46a
Continue working on new admin pages
2014-08-29 20:50:43 +08:00
fanningert
56b735f67b
Update locale_de-DE.ini
...
Add missing translation keys and add some german translations
2014-08-29 14:25:29 +02:00
Unknwon
8829174574
Finish new admin users pages
2014-08-29 15:32:52 +08:00
fanningert
c4a33892d3
Update locale_de-DE.ini
...
Add missing translation of "locale_en-US.ini"
2014-08-28 19:12:30 +02:00
Unknwon
1aec1a2dda
Finish new admin dashboard
2014-08-28 22:29:00 +08:00
Unknwon
81287ba022
Mirror issue fix
2014-08-27 22:40:45 +08:00
Unknwon
74b31566cf
Finsih add/remove repo in organization
2014-08-26 18:11:15 +08:00
Unknwon
21a1b8e5a3
Finish new edit team page, add member to team
2014-08-24 21:09:05 +08:00
Unknwon
fa60502a70
Working on organization pages
2014-08-23 20:24:02 +08:00
Unknwon
bba707de36
Finish team list, create new team, join/leave team page
2014-08-16 16:21:17 +08:00
Unknwon
36b4c57ff1
Finish new organization members and invitation page
2014-08-15 18:29:41 +08:00
fanningert
202a29a475
Correct type issue in locale_en-US.ini
2014-08-14 21:56:56 +02:00
fanningert
352d8943e4
German translation updated
2014-08-14 21:54:11 +02:00
fanningert
ccc20f7c70
Correct type issue in locale_en-US.ini
2014-08-14 21:52:01 +02:00
fanningert
d0dd90958a
Initial release of german translation
2014-08-14 10:55:07 +02:00
fanningert
ba8b6f5d78
Correct some type issues
2014-08-14 10:53:08 +02:00
fanningert
872cd0d3bd
Correct some type issues
2014-08-14 10:51:55 +02:00
Unknwon
5acc948562
Page: /org/:orgname/settings
2014-08-14 14:12:21 +08:00
rojaro
371372d65d
Update locale_en-US.ini
...
Fixed typo
2014-08-13 11:24:24 +02:00
Unknwon
5fbf8531e6
Finish new home page of organization
2014-08-10 20:11:18 -07:00
Unknwon
7af7584d25
Finish new reset password, etc.
2014-08-09 21:02:00 -07:00
Unknwon
5605af973b
Feature: Social sign in
2014-08-09 18:01:29 -07:00
Unknwon
78defd238c
Page: Manage social accounts
2014-08-09 17:25:02 -07:00
Unknwon
9a1d5d2489
Finish new web hook pages
2014-08-09 15:40:10 -07:00
Unknwon
9820b8e134
Finish new hooks list page
2014-08-09 10:29:51 -07:00
Unknwon
e8c9bb2c66
Finish new collaboration page
2014-08-07 06:40:05 -04:00
Unknwon
755eec745f
Finish new repo settings page
2014-08-02 13:47:33 -04:00
无闻
568c9b353e
Merge pull request #311 from nuss-justin/issue/281
...
Fix #281 . Add mouse-over precise time and on-click switch listener.
2014-08-01 00:15:06 -04:00
Unknwon
dabf5b057c
Finish new migrate page
2014-08-01 00:06:19 -04:00
Unknwon
9813161411
Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page
2014-07-26 23:53:16 -04:00
Justin Nuß
91480f3791
Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
...
Conflicts:
modules/base/tool.go
2014-07-26 11:23:58 +02:00
Unknwon
5c4bc3c848
Huge updates!!!!! Be careful to merge!!!!
2014-07-26 02:28:04 -04:00
Unknwon
8dd07c0ddd
New UI merge in progress
2014-07-26 00:24:27 -04:00