sucs-site merge requestshttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests2015-06-06T21:22:48Zhttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/1Merge changes from master (tunk) into beta2015-06-06T21:22:48ZImran Hussainimranh@sucs.orgMerge changes from master (tunk) into betasucs-site (live) is ahead of beta :/
Pushing merge changes (the new fancy way) from master (trunk) into the beat branch.sucs-site (live) is ahead of beta :/
Pushing merge changes (the new fancy way) from master (trunk) into the beat branch.Imran Hussainimranh@sucs.orgImran Hussainimranh@sucs.orghttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/3ckeditor is now included as a submodule2015-09-16T06:23:38ZGhost Userckeditor is now included as a submoduleAdded ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't get added to the repo in future.
Also included the the cached template folder 'template_c' so that doesn...Added ckeditor stable as a submodule to htdocs/js/ckeditor
Added a gitignore so that the files generated by the setup script don't get added to the repo in future.
Also included the the cached template folder 'template_c' so that doesn't get included either
Changes to be committed:
* new file: .gitignore
* new file: .gitmodules
* new file: htdocs/js/ckeditorhttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/4Deploy changes to beta.sucs.org2015-09-16T14:52:28ZImran Hussainimranh@sucs.orgDeploy changes to beta.sucs.orgThese changes look good to me.
no bugs that I can find, deploy to beta and see if it still holds up.These changes look good to me.
no bugs that I can find, deploy to beta and see if it still holds up.Imran Hussainimranh@sucs.orgImran Hussainimranh@sucs.orghttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/5Move Beta to Current2015-09-17T13:38:42ZGhost UserMove Beta to Currentbeta.sucs.org is currently running the version I propose we move to stable. However as this version of beta.sucs.org has only very recently been deployed it would be worth looking through and testing to make sure the features work.
Al...beta.sucs.org is currently running the version I propose we move to stable. However as this version of beta.sucs.org has only very recently been deployed it would be worth looking through and testing to make sure the features work.
Also wise to go through the changes and check that there isn't anything silly that shouldn't be included.
Just checking before I submit this initial WIP merge request
* ~~148b8dce includes the lastsnap.jpg which really needs to be removed from the git and added to the .gitignore that I added recently.~~
* ~~get someone with the ability to edit pages or add news articles to check that ckeditor works as expected.~~https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/6Remove lastsnap from the repo2015-09-17T13:27:27ZImran Hussainimranh@sucs.orgRemove lastsnap from the repo!5 brought up this issue.!5 brought up this issue.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/7Changed README file to markdown2015-09-22T21:17:44ZIsabel JenkinsChanged README file to markdownChanged the README file to use markdown instead of just plain text, as nice documentation is rather useful.Changed the README file to use markdown instead of just plain text, as nice documentation is rather useful.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/8Removed google search bar closes #162015-09-23T17:21:51ZIsabel JenkinsRemoved google search bar closes #16Removed the google search bar as I suggested in issue #16Removed the google search bar as I suggested in issue #16https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/9Merge fixes #172015-09-23T18:07:16ZIsabel JenkinsMerge fixes #17Fixed issue with bananas page links for none membersFixed issue with bananas page links for none membershttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/10Add link to nmap log parser2015-09-24T11:07:34ZCallum MasseyAdd link to nmap log parserAdd link to new IP/MAC trackerAdd link to new IP/MAC trackerCallum MasseyCallum Masseyhttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/11Deploy bugfixes into beta2015-09-24T12:46:11ZImran Hussainimranh@sucs.orgDeploy bugfixes into betaWe've had a few bug fixes that are ready to be tested on beta.We've had a few bug fixes that are ready to be tested on beta.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/12Deploy bugfixes into live2015-09-24T12:55:05ZImran Hussainimranh@sucs.orgDeploy bugfixes into liveThe bugixes seem to be working in a production like environment.
Nothing seems to be broken because of them.The bugixes seem to be working in a production like environment.
Nothing seems to be broken because of them.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/13Disable cert checking when talking to the SU-API2015-09-24T16:23:15ZImran Hussainimranh@sucs.orgDisable cert checking when talking to the SU-APIDisable verifying of the cert wehn talking to the SU-API VM. We don't need it,
as long as the data is sent down a secure connection that's all we really care
about. Also this makes tings easier to admin as we don't need to worry about
...Disable verifying of the cert wehn talking to the SU-API VM. We don't need it,
as long as the data is sent down a secure connection that's all we really care
about. Also this makes tings easier to admin as we don't need to worry about
renewing certs during freshers.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/14Push "Disable cert checking when talking to the SU-API" onto beta2015-09-24T18:12:28ZImran Hussainimranh@sucs.orgPush "Disable cert checking when talking to the SU-API" onto betaPush "Disable cert checking when talking to the SU-API onto" betaPush "Disable cert checking when talking to the SU-API onto" betahttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/15Push "Disable cert checking when talking to the SU-API" onto live 2015-09-25T12:39:04ZImran Hussainimranh@sucs.orgPush "Disable cert checking when talking to the SU-API" onto live Code hasn't exploded and it fixes the problem we have.Code hasn't exploded and it fixes the problem we have.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/16Fix short uri page not displaying the box thing properly.2015-09-25T15:07:57ZImran Hussainimranh@sucs.orgFix short uri page not displaying the box thing properly.Horrible hack that works for now. To be gotten rid of in redesign.Horrible hack that works for now. To be gotten rid of in redesign.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/17Push shirturi box thing fix to live 2015-09-25T15:10:40ZImran Hussainimranh@sucs.orgPush shirturi box thing fix to live werks fine in betawerks fine in betahttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/18Fixed postcode lookup2015-09-27T16:50:47ZImran Hussainimranh@sucs.orgFixed postcode lookupMade the sucs site use the SUCS PAF lookup.Made the sucs site use the SUCS PAF lookup.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/19Push postcode lookup fix to beta2015-09-27T17:05:48ZImran Hussainimranh@sucs.orgPush postcode lookup fix to betaThe title.The title.https://projects.sucs.org/sucssite/sucs-site/-/merge_requests/20Push postcode fix to live2015-09-27T17:07:49ZImran Hussainimranh@sucs.orgPush postcode fix to livehttps://projects.sucs.org/sucssite/sucs-site/-/merge_requests/21Auto add users to printer when they sign up because I hate doign it manualy a...2015-09-29T19:03:02ZImran Hussainimranh@sucs.orgAuto add users to printer when they sign up because I hate doign it manualy and ……it takes a long time to do it manualy and I make mistakes and peopel complain and stuff.…it takes a long time to do it manualy and I make mistakes and peopel complain and stuff.