NaNtic
/
nereid-project
mirror of https://github.com/NaN-tic/nereid-project.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
152 Commits 8 Branches 9 Tags 3.1 MiB
Commit Graph

152 Commits

Author SHA1 Message Date
Sharoon Thomas c35a8d49da Merge branch 'release/2.6.2.0' 2013-08-09 13:57:44 +05:30
Sharoon Thomas 66239cb4b0 Release version 2.6.2.0 2013-08-09 13:51:27 +05:30
Sharoon Thomas 140087ee16 Refactor tempaltes for the changes in timesheet 2013-08-09 13:51:06 +05:30
Sharoon Thomas 1db5651ac2 Merge pull request #29 from simmianand/feature/task-2221 
Fix: "timesheet.line" for the field "object_" is not in selection #2221
 2013-08-09 00:11:49 -07:00
Simmi Anand 24d3eaf54c Fix: "timesheet.line" for the field "object_" is not in selection #2221 
* This patch includes creation of record for 'timesheet.line' in
  project.xml for nereid_allowed_activity_model
 2013-08-09 12:31:30 +05:30
Sharoon Thomas f9fc8163b0 Merge branch 'develop' of github.com:openlabs/nereid-project into develop 2013-08-09 02:46:16 +00:00
Sharoon Thomas f7e85090d8 Oops! version was not bumped to 2.6.2.0dev 2013-08-09 07:32:50 +05:30
Sharoon Thomas c2e06d9f92 Merge branch 'timesheet-fix' into develop 2013-08-09 01:54:33 +00:00
Sharoon Thomas 3c25967215 Fix timesheet issues 2013-08-08 16:54:28 +00:00
Sharoon Thomas 60e87ef2ab Merge pull request #28 from simmianand/feature/task-2153 
Merged nereid-activity-stream #2153
 2013-08-08 06:47:38 -07:00
Simmi Anand e709542a56 Merged nereid-activity-stream #2153 
* This patch include Activity stream generation for any activity created
  on Project Management System

Issue ID: 336001
Task ID: project-7/task-2153
 2013-08-08 18:39:16 +05:30
Sharoon Thomas 51f50088ee Merge pull request #25 from simmianand/feature/task-2147 
get_task of project.py has tuple unpacking issue #2147
 2013-08-06 07:39:58 -07:00
Simmi Anand 4f7b590c81 get_task of project.py has tuple unpacking issue #2147 
* This patch removes tuple unpacking of task from get_task, and project
  from get_project, instead getting values by tuble indexing

Task ID: project-7/task-2147
Issue ID: 299006
 2013-08-06 13:48:10 +05:30
Sharoon Thomas df2d8f69ce Merge branch 'develop' of github.com:openlabs/nereid-project into develop 2013-08-05 13:15:07 +05:30
Sharoon Thomas 998701bb61 Merge branch 'hotfix/2.6.1.1' into develop 2013-08-05 13:14:03 +05:30
Sharoon Thomas c8ce97d2a9 Merge branch 'hotfix/2.6.1.1' 2013-08-05 13:13:54 +05:30
Sharoon Thomas 789fb4c5f8 Release hotfix version 2.6.1.1 2013-08-05 13:13:45 +05:30
Simmi Anand 373fe88001 Fix: Time was updating on previous task instead of current task #2170 
* This patch includes changes in passing task.work.id in TimesheetLine
  work field replacing task.id

Task ID: project-7/task-2170
 2013-08-05 13:13:18 +05:30
Sharoon Thomas c2cae29487 Merge branch 'hotfix/2.6.1.1' into develop 2013-08-05 13:11:05 +05:30
Sharoon Thomas 975cb9f124 Release hotfix version 2.6.1.1 2013-08-05 13:10:48 +05:30
Simmi Anand b841431575 Fix: Time was updating on previous task instead of current task #2170 
* This patch includes changes in passing task.work.id in TimesheetLine
  work field replacing task.id

Task ID: project-7/task-2170
 2013-08-05 13:09:17 +05:30
Sharoon Thomas e0ef0e519c Merge pull request #24 from simmianand/hotfix/task-2170 
Fix: Time was updating on previous task instead of current task #2170
 2013-08-05 00:37:02 -07:00
Simmi Anand ebb7b18aa1 Fix: Time was updating on previous task instead of current task #2170 
* This patch includes changes in passing task.work.id in TimesheetLine
  work field replacing task.id

Task ID: project-7/task-2170
 2013-08-05 12:36:24 +05:30
Sharoon Thomas afe561eee1 Merge pull request #23 from simmianand/feature/task-1955 
[my_openlabs] ModelView for get_gantt_data #1955
 2013-08-01 05:41:56 -07:00
Simmi Anand f61426da99 ModelView for get_gantt_data #1955 
* This patch includes the __register__ method in a view model
  'TimesheetEmployeeDay' to create a relation for running get_gantt_data
  and get_comparison_data

Issue ID: 242002
Task ID: project-7/task-1955
 2013-07-30 18:46:40 +05:30
Sharoon Thomas 3e7a2a1d39 Convert commit handlers to classmethods 2013-07-29 20:58:28 +00:00
Sharoon Thomas 9b19cdad36 Fix migration typo 2013-07-29 09:08:52 +00:00
Sharoon Thomas dbabf40acd Merge pull request #21 from simmianand/feature/task-1662 
Attachments with duplicate name #1662
 2013-07-22 01:03:02 -07:00
Sharoon Thomas 479db77b9f Merge pull request #22 from simmianand/feature/task-1564 
Add a field to tag and attach file while creating the task #1564
 2013-07-21 23:20:03 -07:00
Simmi Anand 005eec9a40 Add a field to tag and attach file while creating the task #1564 
* Added multi selection tags field while creating task

Task ID: project-7/task-1564
Issue ID: 139001
 2013-07-19 21:48:16 +05:30
Simmi Anand 359b8d309f Attachments with duplicate name #1662 
* A flash message is thrown when a user attach a file with the same name
  in same task

Issue ID: 228001
Task ID: project-7/task-1662
 2013-07-19 21:37:53 +05:30
Sharoon Thomas a0aef95cd2 Remove the directory contents before building docs 2013-05-30 17:47:23 +05:30
Sharoon Thomas dcbc46ac28 Merge pull request #20 from simmianand/feature/task-1352 
Nereid Project documentation #1352
 2013-05-30 05:15:44 -07:00
Simmi Anand 02790c77f9 Modified Nereid Project documentation #1352 2013-05-29 17:26:22 +05:30
Sharoon Thomas d659c4919c Merge pull request #19 from simmianand/feature/task-1246 
Minor change in global-timesheet.jinja template #1246
 2013-05-29 00:47:36 -07:00
Simmi Anand 7470f4ac59 Minor change in global-timesheet.jinja template #1246 
* On global timesheet 'Calender Tab'-timesheet lines and weekly anaysis
  was also active, now issue resolved.
 2013-05-29 12:46:47 +05:30
Sharoon Thomas 5a2a464853 Merge pull request #18 from simmianand/feature/task-1492 
Template changes of myopenlabs to nereid project #1492
 2013-05-28 07:42:34 -07:00
Simmi Anand 0599b308d9 Template changes of myopenlabs to nereid project #1492 
* On ui in my-tasks, its possible to drag task from one state to other
* Possible to edit task brief and description, form task list only
  without going to task page.
* Task color should show its state.

Issue ID: 94001
 2013-05-28 17:38:45 +05:30
Sharoon Thomas 46e95c14a9 Add fabfile to deploy documentation 2013-05-28 14:37:49 +05:30
Sharoon Thomas 91b802f638 Merge pull request #17 from simmianand/feature/task-1352 
Nereid Project Documentation #1352
 2013-05-28 01:25:35 -07:00
Simmi Anand d0aad2c080 Nereid Project Documentation #1352 
Added content and screenshots about Nereid Project into Documentaion

Task-Project-7/task-1352
Issue ID- 48003
 2013-05-28 12:23:21 +05:30
Sharoon Thomas a5aecaa1af Merge branch 'release/2.6.1.0' into develop 2013-05-21 21:02:15 +05:30
Sharoon Thomas ae96c7ac95 Merge branch 'release/2.6.1.0' 2013-05-21 21:02:01 +05:30
Sharoon Thomas cd9a7d8b8b Release version 2.6.1.0 2013-05-21 21:01:50 +05:30
Sharoon Thomas 66e8a51bed Add a README 2013-05-21 20:58:58 +05:30
Sharoon Thomas 72b179fc8f Merge pull request #15 from sharoonthomas/develop 2013-05-21 08:00:12 -07:00
Sharoon Thomas 6714c4a074 Use TableHandler not Interface 2013-05-21 20:19:09 +05:30
Sharoon Thomas 56b46f20c0 Add blinker as dependency 2013-05-21 18:58:45 +05:30
Sharoon Thomas eea1ddb2c5 Add .travis.yml for CI 2013-05-21 18:52:19 +05:30
Sharoon Thomas 1063f59b7d Merge branch 'release/2.4.0.1' 2013-05-21 18:44:19 +05:30