jonassanoj / dbpro

DB Project 1
19 stars 1 forks source link

field_model: document this class and all its functions #64

Closed tilman-schieber closed 12 years ago

tilman-schieber commented 12 years ago

line 3: complete field_model documentation according to the guidelines. Look at question_model for an example. Every function and the class itself needs a complete phpdoc.

ali-naseri commented 12 years ago

some strange things are happening, I just documented the field_model, and now I look that Mahboobi is also documented something for it. I also cannot commit my changes due to conflicts. I pulled the repo, and it causes conflicts with my edited files.

tilman-schieber commented 12 years ago
  1. commit
  2. pull
  3. push if problems persist:
  4. git stash
  5. git pull
  6. git stash pop
ali-naseri commented 12 years ago

It gives this error, To https://github.com/jonassanoj/dbpro.git 28d9568..c56957a master -> master

tilman-schieber commented 12 years ago

so how is this an error?

On Tue, Jun 19, 2012 at 5:32 PM, Ali Aqa Naseri reply@reply.github.com wrote:

It gives this error, To https://github.com/jonassanoj/dbpro.git   28d9568..c56957a  master -> master


Reply to this email directly or view it on GitHub: https://github.com/jonassanoj/dbpro/issues/64#issuecomment-6428279

sayed-ahmad commented 12 years ago

Mr. Ali Aqa, I have already done this, and I assigned this task to myself four days ago and I have already closed this issue, and you can check the wiki already my name is there. this might be the problem.

tilman-schieber commented 12 years ago

This task was done twice:

(Ali Aga): This is badly documented. It does not parse in phpdoc and parameters are not documented. return values are not even described. Overwrote documentation of Sayed Ahmad.