Skip to content
This repository has been archived by the owner on Feb 27, 2024. It is now read-only.

Feature/contributor page #73

Closed

Conversation

mockiemockiz
Copy link
Contributor

contributor page would be look like this:

screenshot from 2014-12-08 23 08 41

but it would be better to remake the icons so the icon looks fit like other, but I'm using ubuntu now and I don't like the gimp. maybe later I'll remake them.

samsonasik and others added 4 commits December 7, 2014 00:35
Forward port sitrunlab#69

* master:
  added entity test
  fixes exclude the vendor folder from coverage because of wrong jumping folder
  added vendor/ to blacklist coverage
  added IF NOT EXISTS check
  configure travis to fit with database
  sitrunlab#69 changelog
  added sqldump
  - remove unused static config config/autoload/global.php for module list -  Apply fetch module from the module_list table
  load module list from db in home page
  initial db usage for module list
Forward port sitrunlab#70

* master: (34 commits)
  Added vendor directory to test code coverage blacklist in Pagination module
  Fixed code sniffer errors
  Fixed wrong return types
  Added documentation for Pagination module
  Added IndexControllerTest in Pagination module
  Added QueryUrlFactoryTest in Pagination module
  Added IndexControllerFactoryTest in Pagination module
  Created first tests for Pagination module
  Paginator view partial now uses queryUrl helper in Pagination module
  Fixed bugs on QueryUrl view helper in Pagination module
  Created QueryUrl view helper to allow query params inheritance in Pagination module
  Added message in Pagination module which is displayed when no elements are returned
  Created filtering form in Pagination module
  Added Pagination module to build script
  Enhanced data rendering in Pagination module
  Implemented rendering of data table in Pagination module
  Created pagination partial
  Implemented data manipulation in Pagination module
  Created Pagination\IndexControllerFactory
  Created data array for Pagination module
  ...
Forward port sitrunlab#71

* master:
  update sqldump as new Pagination module
@mockiemockiz
Copy link
Contributor Author

"again" I forgot to change the destination to develop.. sorry

@samsonasik
Copy link
Member

Thank you. it is targetted to 0.0.3 which is maintenance release, so it is right to master, this just need to rebase. I will cherry-pick mockiemockiz@94b3f43 to my branch. the commit will grabbed, but will not looks merged because I only 'grab' one commit from this PR, the first 2 commits on this PR is not related to this PR. On future PR, the PR should rebase first, like :

$ git remote add upstream https://github.com/sitrunlab/LearnZF2.git
# for feature
$ git checkout develop
$ git pull feature upstream develop

# and now, we can start work on feature
$ git checkout -b feature/seo develop
# rebase to make sure it not overlapped with develop
$ git rebase develop
# do change and commit
$ git push origin feature/seo

master and develop should only changed by pull from upstream, except for merging the PR.

@samsonasik samsonasik closed this Dec 8, 2014
@samsonasik
Copy link
Member

I've cherry-picked mockiemockiz@94b3f43 into PR #74 , Thank you ;)

@mockiemockiz mockiemockiz deleted the feature/contributor-page branch December 15, 2014 07:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants