be5738243c 
								
							 
						 
						
							
							
								
								fix repo settings external tracker failed and check external urls ( #1215 )  
							
							
							
						 
						
							2017-03-13 09:41:40 +08:00  
				
					
						
							
							
								 
						
							
								fd941db246 
								
							 
						 
						
							
							
								
								Protected branches system ( #339 )  
							
							... 
							
							
							
							* Protected branches system
* Moved default branch to branches section (`:org/:reponame/settings/branches`).
* Initial support Protected Branch.
  - Admin does not restrict
  - Owner not to limit
  - To write permission restrictions
* reformat tmpl
* finished the UI and add/delete protected branch response
* remove unused comment
* indent all the template files and remove ru translations since we use crowdin
* fix the push bug 
							
						 
						
							2017-02-21 23:02:10 +08:00  
				
					
						
							
							
								 
						
							
								027591a3a5 
								
							 
						 
						
							
							
								
								Redirects for renamed repos ( #807 )  
							
							... 
							
							
							
							* Redirects for renamed repos
* Remove unused phrase from locales 
							
						 
						
							2017-02-05 22:35:03 +08:00  
				
					
						
							
							
								 
						
							
								8a421b1fd7 
								
							 
						 
						
							
							
								
								Add units concept for modulable functions of a repository ( #742 )  
							
							... 
							
							
							
							* Add units concept for modulable functions of a repository
* remove unused comment codes & fix lints and tests
* remove unused comment codes
* use struct config instead of map
* fix lint
* rm wrong files
* fix tests 
							
						 
						
							2017-02-04 23:53:46 +08:00  
				
					
						
							
							
								 
						
							
								a4ece1f223 
								
							 
						 
						
							
							
								
								Fixes typos  
							
							
							
						 
						
							2016-11-27 12:59:12 +01:00  
				
					
						
							
							
								 
						
							
								94da472717 
								
							 
						 
						
							
							
								
								Golint fixed for modules/setting ( #262 )  
							
							... 
							
							
							
							* golint fixed for modules/setting
* typo fixed and renamed UNIXSOCKET to UnixSocket 
							
						 
						
							2016-11-27 18:14:25 +08:00  
				
					
						
							
							
								 
						
							
								3917ed45de 
								
							 
						 
						
							
							
								
								golint fixed for routers ( #208 )  
							
							
							
						 
						
							2016-11-24 15:04:31 +08:00  
				
					
						
							
							
								 
						
							
								4247304f5a 
								
							 
						 
						
							
							
								
								Update import paths from github.com/go-gitea to code.gitea.io ( #135 )  
							
							... 
							
							
							
							- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis
See https://docs.travis-ci.com/user/languages/go#Go-Import-Path  
							
						 
						
							2016-11-10 17:24:48 +01:00  
				
					
						
							
							
								 
						
							
								864d1b1f9f 
								
							 
						 
						
							
							
								
								Fix type in unused constant name ( #111 )  
							
							... 
							
							
							
							* Write LDAP, SMTP, PAM, DLDAP back to all uppercase
* Fix type in unused constant name
* Other MixCased fixes
* Complete MixerCasing of template constants
* Re uppercase LTS and LDAPS suffixes
* Uppercase JSON suffix in constant names
* Proper case LoginNoType
* Prefix unexported template path constants with "tpl" 
							
						 
						
							2016-11-07 18:58:22 -02:00  
				
					
						
							
							
								 
						
							
								0b62aeb495 
								
							 
						 
						
							
							
								
								More MixedCase consts  
							
							
							
						 
						
							2016-11-07 17:08:21 +01:00  
				
					
						
							
							
								 
						
							
								6e4252dad4 
								
							 
						 
						
							
							
								
								Replace gogits/git-module dependency with go-gitea/git ( #94 )  
							
							... 
							
							
							
							* Replace gogits/git-module dependency with go-gitea/git
Fixes  #92 
* Remove git alias for git module import (not needed) 
							
						 
						
							2016-11-06 11:18:34 -02:00  
				
					
						
							
							
								 
						
							
								8dc49dc114 
								
							 
						 
						
							
							
								
								Implementation of the feature to redirect to an external issue tracker  
							
							
							
						 
						
							2016-11-04 09:06:54 +01:00  
				
					
						
							
							
								 
						
							
								2d68bd1ef9 
								
							 
						 
						
							
							
								
								Change import reference to match gitea instead of gogs ( #37 )  
							
							
							
						 
						
							2016-11-03 10:29:56 -02:00  
				
					
						
							
							
								 
						
							
								8516dfcb6c 
								
							 
						 
						
							
							
								
								#2018  able to sync now for mirrors  
							
							... 
							
							
							
							- Refactor code to use sync.UniqueQueue
- Closes  #3509  
							
						 
						
							2016-08-30 16:18:33 -07:00  
				
					
						
							
							
								 
						
							
								0885784f13 
								
							 
						 
						
							
							
								
								Wiki mirroring implementation ( #3233 )  
							
							... 
							
							
							
							* Implement wiki mirroring, add Update mirrors operation to admin dashboard
* bindata.go update after merge
* Implement checking Git repo endpoint existence, support for BB included
* Remove admin dashboard operation
Fix bindata.go
* Apply gofmt to repo model file
* Try to remove bindata from PR
* Revert accepted wiki names change in favor of better system
* Remove unused imports 
							
						 
						
							2016-08-11 10:18:51 -07:00  
				
					
						
							
							
								 
						
							
								1f2e173a74 
								
							 
						 
						
							
							
								
								Refactor User.Id to User.ID  
							
							
							
						 
						
							2016-07-24 01:08:22 +08:00  
				
					
						
							
							
								 
						
							
								25b3836418 
								
							 
						 
						
							
							
								
								Refresh repository mirror from database when the repository's name has changed. ( #3276 )  
							
							
							
						 
						
							2016-07-17 09:30:43 +08:00  
				
					
						
							
							
								 
						
							
								f1b8d52eb3 
								
							 
						 
						
							
							
								
								#2854  fix no mail notification when issue is closed/reopened  
							
							
							
						 
						
							2016-07-16 00:36:39 +08:00  
				
					
						
							
							
								 
						
							
								7ca5f8f119 
								
							 
						 
						
							
							
								
								models/repo: remove redundant info for some repo methods  
							
							... 
							
							
							
							RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink 
							
						 
						
							2016-07-15 21:53:43 +08:00  
				
					
						
							
							
								 
						
							
								98b152030d 
								
							 
						 
						
							
							
								
								The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true ( #3246 )  
							
							... 
							
							
							
							Executed go fmt
getEngine() not handles DB parameters (#2972 ) (#2974 )
Uses .AllCols() for Update in updateMirror()
Spanish traslation removed
Fixed a wrong way to ommit the --prune option in process.ExecDir() for MirrorUpdate function 
							
						 
						
							2016-07-09 13:22:28 +08:00  
				
					
						
							
							
								 
						
							
								ba314a7a36 
								
							 
						 
						
							
							
								
								Support alphanumeric issue style (ABC-1234) for external issue tracker ( #2992 )  
							
							
							
						 
						
							2016-04-22 18:28:08 -04:00  
				
					
						
							
							
								 
						
							
								514382e2eb 
								
							 
						 
						
							
							
								
								Rename module: middleware -> context  
							
							
							
						 
						
							2016-03-11 11:56:52 -05:00  
				
					
						
							
							
								 
						
							
								a5b0400be7 
								
							 
						 
						
							
							
								
								#1146  finish new access rights for collaborators  
							
							
							
						 
						
							2016-03-05 20:45:23 -05:00  
				
					
						
							
							
								 
						
							
								045f14fbd0 
								
							 
						 
						
							
							
								
								#1146  finsih UI work for access mode of collaborators  
							
							... 
							
							
							
							Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin. 
							
						 
						
							2016-03-05 18:08:42 -05:00  
				
					
						
							
							
								 
						
							
								260723e2cc 
								
							 
						 
						
							
							
								
								Minor fixes for  #2745  
							
							
							
						 
						
							2016-03-03 23:24:22 -05:00  
				
					
						
							
							
								 
						
							
								f3358f5927 
								
							 
						 
						
							
							
								
								Repo setting to delete and disable wiki  
							
							
							
						 
						
							2016-03-03 16:12:48 -05:00  
				
					
						
							
							
								 
						
							
								7140dbac95 
								
							 
						 
						
							
							
								
								Fix   #857  
							
							
							
						 
						
							2016-02-20 15:10:34 -05:00  
				
					
						
							
							
								 
						
							
								632c27802c 
								
							 
						 
						
							
							
								
								Minor fix for  #2624  
							
							
							
						 
						
							2016-02-15 14:57:15 -05:00  
				
					
						
							
							
								 
						
							
								bb595666ac 
								
							 
						 
						
							
							
								
								Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database  
							
							
							
						 
						
							2016-02-15 14:59:24 +01:00  
				
					
						
							
							
								 
						
							
								15d37b7a95 
								
							 
						 
						
							
							
								
								Refactored according to suggestions  
							
							
							
						 
						
							2016-02-14 22:40:39 +01:00  
				
					
						
							
							
								 
						
							
								15394f613f 
								
							 
						 
						
							
							
								
								Add missing safety check  
							
							
							
						 
						
							2016-02-14 21:22:36 +01:00  
				
					
						
							
							
								 
						
							
								3650bd8528 
								
							 
						 
						
							
							
								
								Convert mirrors to regular repositories.  
							
							
							
						 
						
							2016-02-14 21:12:00 +01:00  
				
					
						
							
							
								 
						
							
								8d58e06ad8 
								
							 
						 
						
							
							
								
								more fix on  #2268  
							
							
							
						 
						
							2015-12-30 18:47:32 -05:00  
				
					
						
							
							
								 
						
							
								19423957b1 
								
							 
						 
						
							
							
								
								rename import path  
							
							
							
						 
						
							2015-12-15 17:25:45 -05:00  
				
					
						
							
							
								 
						
							
								40f3142264 
								
							 
						 
						
							
							
								
								#2114  External URL for wiki  
							
							
							
						 
						
							2015-12-11 04:55:08 -05:00  
				
					
						
							
							
								 
						
							
								9a2e43bff2 
								
							 
						 
						
							
							
								
								move out git module and  #1573  send push hook  
							
							
							
						 
						
							2015-12-09 20:46:05 -05:00  
				
					
						
							
							
								 
						
							
								120cd4e471 
								
							 
						 
						
							
							
								
								#1984  Better mirror repo management  
							
							
							
						 
						
							2015-12-08 20:06:12 -05:00  
				
					
						
							
							
								 
						
							
								ca8ce793d1 
								
							 
						 
						
							
							
								
								#2063  Ability to delete repo from admin panel  
							
							
							
						 
						
							2015-12-05 17:39:29 -05:00  
				
					
						
							
							
								 
						
							
								404867f206 
								
							 
						 
						
							
							
								
								fix   #2105  and  fix   #1857  
							
							
							
						 
						
							2015-12-05 13:24:13 -05:00  
				
					
						
							
							
								 
						
							
								e538ff2770 
								
							 
						 
						
							
							
								
								fix   #1829  and  fix   #890  
							
							
							
						 
						
							2015-12-04 21:30:33 -05:00  
				
					
						
							
							
								 
						
							
								4d9499c2d3 
								
							 
						 
						
							
							
								
								fix broken link  
							
							
							
						 
						
							2015-12-03 18:10:45 -05:00  
				
					
						
							
							
								 
						
							
								cc8f5add6e 
								
							 
						 
						
							
							
								
								fix   #976  
							
							
							
						 
						
							2015-12-03 00:24:37 -05:00  
				
					
						
							
							
								 
						
							
								f455125d4d 
								
							 
						 
						
							
							
								
								fix   #878  
							
							
							
						 
						
							2015-11-18 21:21:47 -05:00  
				
					
						
							
							
								 
						
							
								2c653141a8 
								
							 
						 
						
							
							
								
								#1742  Update default branch in git repository while change in web view  
							
							
							
						 
						
							2015-11-18 19:32:23 -05:00  
				
					
						
							
							
								 
						
							
								9a0902523b 
								
							 
						 
						
							
							
								
								fix   #1987  
							
							
							
						 
						
							2015-11-18 15:01:11 -05:00  
				
					
						
							
							
								 
						
							
								0fbb8c8826 
								
							 
						 
						
							
							
								
								New push to head repo of head branch: regenerate patch and retest apply  
							
							
							
						 
						
							2015-10-24 03:36:47 -04:00  
				
					
						
							
							
								 
						
							
								2729eb998c 
								
							 
						 
						
							
							
								
								#1646  and other minor fixes  
							
							
							
						 
						
							2015-09-16 15:34:46 -04:00  
				
					
						
							
							
								 
						
							
								398569f6f8 
								
							 
						 
						
							
							
								
								#1021  Forked repo unavailable after deleting original repo  
							
							
							
						 
						
							2015-09-01 11:43:53 -04:00  
				
					
						
							
							
								 
						
							
								8af094967f 
								
							 
						 
						
							
							
								
								#1377  add rename repo action  
							
							
							
						 
						
							2015-09-01 09:29:52 -04:00  
				
					
						
							
							
								 
						
							
								cb381078ff 
								
							 
						 
						
							
							
								
								finish new repo options page  
							
							
							
						 
						
							2015-08-31 13:36:31 +08:00  
				
					
						
							
							
								 
						
							
								55ddf225bb 
								
							 
						 
						
							
							
								
								webhook APIs  
							
							
							
						 
						
							2015-08-29 11:49:59 +08:00  
				
					
						
							
							
								 
						
							
								f509c59ac1 
								
							 
						 
						
							
							
								
								new create webhook event  
							
							
							
						 
						
							2015-08-28 23:36:13 +08:00  
				
					
						
							
							
								 
						
							
								70e0153b93 
								
							 
						 
						
							
							
								
								add highlight js  
							
							
							
						 
						
							2015-08-27 23:58:50 +08:00  
				
					
						
							
							
								 
						
							
								23f42d92c9 
								
							 
						 
						
							
							
								
								add webhook recent deliveries  
							
							
							
						 
						
							2015-08-27 23:06:14 +08:00  
				
					
						
							
							
								 
						
							
								c08600c59b 
								
							 
						 
						
							
							
								
								new edit webhook UI  
							
							
							
						 
						
							2015-08-27 01:04:23 +08:00  
				
					
						
							
							
								 
						
							
								4217c2333c 
								
							 
						 
						
							
							
								
								new create webhook UI  
							
							
							
						 
						
							2015-08-27 00:30:06 +08:00  
				
					
						
							
							
								 
						
							
								2881456421 
								
							 
						 
						
							
							
								
								new webhooks list UI  
							
							
							
						 
						
							2015-08-26 21:45:51 +08:00  
				
					
						
							
							
								 
						
							
								1cb03135b7 
								
							 
						 
						
							
							
								
								new repo git hooks UI  
							
							
							
						 
						
							2015-08-26 18:03:30 +08:00  
				
					
						
							
							
								 
						
							
								062adbed8a 
								
							 
						 
						
							
							
								
								add confirmation to delete ssh key  
							
							
							
						 
						
							2015-08-20 17:11:29 +08:00  
				
					
						
							
							
								 
						
							
								dea3a8c6a4 
								
							 
						 
						
							
							
								
								WIP: create PR - choose branch  
							
							
							
						 
						
							2015-08-08 22:43:14 +08:00  
				
					
						
							
							
								 
						
							
								9db4acc62e 
								
							 
						 
						
							
							
								
								improve fork process  
							
							
							
						 
						
							2015-08-08 17:10:34 +08:00  
				
					
						
							
							
								 
						
							
								3d0583df0f 
								
							 
						 
						
							
							
								
								fix private repo cannot trigger hook by SSH  
							
							
							
						 
						
							2015-08-08 01:04:12 +08:00  
				
					
						
							
							
								 
						
							
								39a3b768bc 
								
							 
						 
						
							
							
								
								#334 : Add Deployment Key Support  
							
							
							
						 
						
							2015-08-06 22:48:11 +08:00  
				
					
						
							
							
								 
						
							
								e50982f5ec 
								
							 
						 
						
							
							
								
								allow anonymous SSH clone  
							
							
							
						 
						
							2015-08-05 11:14:17 +08:00  
				
					
						
							
							
								 
						
							
								fa298a2c30 
								
							 
						 
						
							
							
								
								#835 : Realtime webhooks  
							
							
							
						 
						
							2015-07-25 21:32:04 +08:00  
				
					
						
							
							
								 
						
							
								ced212f8fa 
								
							 
						 
						
							
							
								
								fix hidden bug on tpl rendering  
							
							
							
						 
						
							2015-07-10 17:26:50 +08:00  
				
					
						
							
							
								 
						
							
								698b9e2acc 
								
							 
						 
						
							
							
								
								#1070  Clearer error message for illegal characters  
							
							
							
						 
						
							2015-03-26 17:11:47 -04:00  
				
					
						
							
							
								 
						
							
								fc6db829b2 
								
							 
						 
						
							
							
								
								fix read access team visibility of private repo  
							
							
							
						 
						
							2015-03-16 04:52:11 -04:00  
				
					
						
							
							
								 
						
							
								18c0697329 
								
							 
						 
						
							
							
								
								routers/repo/setting.go: fix LDAP cannot validate password  #1006  
							
							
							
						 
						
							2015-03-05 19:20:27 -05:00  
				
					
						
							
							
								 
						
							
								8896c82d34 
								
							 
						 
						
							
							
								
								models: fix issue with transfer repository  
							
							... 
							
							
							
							README: fix typo 
							
						 
						
							2015-02-24 00:27:22 -05:00  
				
					
						
							
							
								 
						
							
								ee68a826a5 
								
							 
						 
						
							
							
								
								v4 migration, merge 'dev', clean code and mirror fix  
							
							
							
						 
						
							2015-02-23 02:15:53 -05:00  
				
					
						
							
							
								 
						
							
								7ccab9cd09 
								
							 
						 
						
							
							
								
								Merge branch 'dev' of github.com:gogits/gogs into access  
							
							... 
							
							
							
							Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl 
							
						 
						
							2015-02-22 22:51:25 -05:00  
				
					
						
							
							
								 
						
							
								04164eada3 
								
							 
						 
						
							
							
								
								models: able to rename user with diff letter cases  #981  
							
							... 
							
							
							
							- templates/org: mirror fix on name output
- routers: add missing error check 
							
						 
						
							2015-02-22 18:24:49 -05:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								76f8904718 
								
							 
						 
						
							
							
								
								Introducing Collaboration Struct  
							
							
							
						 
						
							2015-01-23 09:54:16 +02:00  
				
					
						
							
							
								 
						
							
								e948c7c262 
								
							 
						 
						
							
							
								
								Fix   #795  
							
							
							
						 
						
							2014-12-29 11:55:46 +01:00  
				
					
						
							
							
								 
						
							
								ac4a10456e 
								
							 
						 
						
							
							
								
								api: able to create repo and  fix   #726  
							
							... 
							
							
							
							- POST /user/repos
- POST /org/:org/repos 
							
						 
						
							2014-12-12 20:30:32 -05:00  
				
					
						
							
							
								 
						
							
								2f3a7e53cb 
								
							 
						 
						
							
							
								
								fix   #735  
							
							
							
						 
						
							2014-12-12 01:29:36 -05:00  
				
					
						
							
							
								 
						
							
								9dc3c93a6a 
								
							 
						 
						
							
							
								
								#12 , add/edit hook  
							
							
							
						 
						
							2014-11-13 12:57:00 -05:00  
				
					
						
							
							
								 
						
							
								3794111460 
								
							 
						 
						
							
							
								
								update slack hook to use new format  
							
							
							
						 
						
							2014-10-24 08:56:12 -04:00  
				
					
						
							
							
								 
						
							
								41dbb4c148 
								
							 
						 
						
							
							
								
								Hide org member in collar page  
							
							
							
						 
						
							2014-10-10 06:15:27 -04:00  
				
					
						
							
							
								 
						
							
								64c68220d2 
								
							 
						 
						
							
							
								
								Fix   #264  
							
							
							
						 
						
							2014-10-06 17:50:00 -04:00  
				
					
						
							
							
								 
						
							
								a046a31d2b 
								
							 
						 
						
							
							
								
								UI: Confirmation box  
							
							
							
						 
						
							2014-09-29 18:52:28 -04:00  
				
					
						
							
							
								 
						
							
								ad52b2d791 
								
							 
						 
						
							
							
								
								Mirror fix on transfer repo  
							
							
							
						 
						
							2014-09-25 22:36:07 -04:00  
				
					
						
							
							
								 
						
							
								7ba9257a7f 
								
							 
						 
						
							
							
								
								Add suburl support  
							
							
							
						 
						
							2014-09-19 20:11:34 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								a596388ebf 
								
							 
						 
						
							
							
								
								Add success message after transfer repository  #481  
							
							
							
						 
						
							2014-09-17 14:52:46 -04:00  
				
					
						
							
							
								 
						
							
								a2cac952a4 
								
							 
						 
						
							
							
								
								Prepare 0.5 release  
							
							
							
						 
						
							2014-09-12 21:36:26 -04:00  
				
					
						
							
							
								 
						
							
								cfed11f092 
								
							 
						 
						
							
							
								
								Bug: Transfer repository doesn't update the count  
							
							
							
						 
						
							2014-09-12 18:29:58 -04:00  
				
					
						
							
							
								 
						
							
								f7be61c819 
								
							 
						 
						
							
							
								
								getOrgRepoCtx returns values directly & err  
							
							
							
						 
						
							2014-09-05 07:19:34 -04:00  
				
					
						
							
							
								 
						
							
								85c35a6b8b 
								
							 
						 
						
							
							
								
								add organization-level webhooks  
							
							
							
						 
						
							2014-09-05 07:19:34 -04:00  
				
					
						
							
							
								 
						
							
								7269b06fd5 
								
							 
						 
						
							
							
								
								HookType is case-sensitive  
							
							... 
							
							
							
							Update webhook wasn’t showing up because of the wrong case 
							
						 
						
							2014-09-05 07:19:34 -04:00  
				
					
						
							
							
								 
						
							
								2bce24068d 
								
							 
						 
						
							
							
								
								add Slack API webhook support  
							
							
							
						 
						
							2014-08-31 12:01:59 -04:00  
				
					
						
							
							
								 
						
							
								9baf2b38d0 
								
							 
						 
						
							
							
								
								Bug fix on organization  
							
							
							
						 
						
							2014-08-27 16:39:36 +08:00  
				
					
						
							
							
								 
						
							
								21a1b8e5a3 
								
							 
						 
						
							
							
								
								Finish new edit team page, add member to team  
							
							
							
						 
						
							2014-08-24 21:09:05 +08:00  
				
					
						
							
							
								 
						
							
								9a1d5d2489 
								
							 
						 
						
							
							
								
								Finish new web hook pages  
							
							
							
						 
						
							2014-08-09 15:40:10 -07:00  
				
					
						
							
							
								 
						
							
								9820b8e134 
								
							 
						 
						
							
							
								
								Finish new hooks list page  
							
							
							
						 
						
							2014-08-09 10:29:51 -07:00  
				
					
						
							
							
								 
						
							
								e8c9bb2c66 
								
							 
						 
						
							
							
								
								Finish new collaboration page  
							
							
							
						 
						
							2014-08-07 06:40:05 -04:00  
				
					
						
							
							
								 
						
							
								755eec745f 
								
							 
						 
						
							
							
								
								Finish new repo settings page  
							
							
							
						 
						
							2014-08-02 13:47:33 -04:00  
				
					
						
							
							
								 
						
							
								5c4bc3c848 
								
							 
						 
						
							
							
								
								Huge updates!!!!! Be careful to merge!!!!  
							
							
							
						 
						
							2014-07-26 02:28:04 -04:00