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

203 Commits

Author SHA1 Message Date
Priyanka Rani 271edcab8e Merge branch 'release/2.8.0.3' 2013-10-24 14:09:25 +05:30
Priyanka Rani 2e779d9ec9 Bump version to 2.8.0.3 #3001 2013-10-24 14:08:55 +05:30
Sharoon Thomas 522a8013b7 Merge pull request #45 from priyankarani/feature/task-3001 
Change setup.py to pick up the description #3001
 2013-10-23 22:44:49 -07:00
Priyanka Rani 743ba89987 Change setup.py to pick up the description #3001 
Review ID: 583003
 2013-10-23 22:47:47 +05:30
Sharoon Thomas fc5a70e17a Merge pull request #44 from priyankarani/feature/test 
Add Manifest file
 2013-10-23 05:37:48 -07:00
Priyanka Rani f810bab59a Add Manifest file 2013-10-23 17:32:38 +05:30
Priyanka Rani 81bf0bb3ce Merge branch 'release/2.8.0.2' into develop 2013-10-23 13:27:19 +05:30
Priyanka Rani e678e7f4cf Merge branch 'release/2.8.0.2' 2013-10-23 13:27:11 +05:30
Priyanka Rani 7239e95d95 Bump version to 2.8.0.2 2013-10-23 13:27:01 +05:30
Sharoon Thomas 015cccde8d Merge pull request #42 from priyankarani/feature/task-2878 
Show activity stream of projects only where user is participant #2878
 2013-10-16 00:23:13 -07:00
Priyanka Rani 899fba402e Show activity stream of projects only where user is participant #2878 
This patch allows user to see activity stream of projects only where he
is participant.

Review ID: 490002
 2013-10-16 12:12:59 +05:30
Sharoon Thomas a79876ae1e Merge pull request #41 from priyankarani/fix 
Some bug-fix
 2013-10-12 04:31:05 -07:00
Sharoon Thomas 79e0fbd814 Accept duplicate filenames and autofix 2013-10-12 16:05:54 +05:30
Sharoon Thomas 69462ccd02 Send commit timestamp also in isoformat 2013-10-12 15:16:05 +05:30
Sharoon Thomas 51a39e6dbc Use simplejson instead of json 2013-10-12 15:16:05 +05:30
Sharoon Thomas 547ee721b9 Do not show done state in task kanban 2013-10-12 15:16:05 +05:30
Sharoon Thomas c4ee0b8d72 XHR improvements and add Done state 2013-10-12 15:16:05 +05:30
Sharoon Thomas 7161bda0c5 Merge branch 'release/2.8.0.1' into develop 2013-10-01 19:33:00 +05:30
Sharoon Thomas 1cde990507 Merge branch 'release/2.8.0.1' 2013-10-01 19:32:51 +05:30
Sharoon Thomas 7717b38763 Bump version to 2.8.0.1 2013-10-01 19:32:38 +05:30
Sharoon Thomas 882267e7fe Merge branch 'task-2089' of github.com:priyankarani/nereid-project into priyankarani-task-2089 2013-09-21 19:23:12 +05:30
Sharoon Thomas b007461c05 Merge branch 'release/2.6.4.0' into develop 2013-09-21 19:21:58 +05:30
Sharoon Thomas c3660205fd Bump version to 2.6.4.0 2013-09-21 19:21:45 +05:30
Priyanka Rani 1b533ac437 Migration to 2.8 #2089 
Review ID: 303003
 2013-09-21 17:32:13 +05:30
Sharoon Thomas 90dca506f9 More XHR improvements 2013-09-14 19:03:39 +05:30
Sharoon Thomas 269875a6c6 Merge pull request #39 from priyankarani/feature/task-2282 
Activity stream for commit on task #2282
 2013-09-13 01:59:45 -07:00
Priyanka Rani d14bd1da97 Activity stream for commit on task #2282 
This patch has added activity stream for each commit on task.

Review ID: 420005
 2013-09-13 10:56:14 +05:30
Sharoon Thomas b2f213b9fb Allow filtering by the tasks you are watching #2441 2013-09-12 13:21:27 +00:00
Sharoon Thomas 7298869a43 Merge pull request #37 from Abhisar/feature/task-2244 
Create a unique constraint on project and nereid user #2244
 2013-09-12 04:50:47 -07:00
Abhisar 1e637cb191 Create a unique constraint on project and nereid user #2244 
Task ID: 2244
 2013-09-10 10:51:56 +05:30
Sharoon Thomas d0df64f164 Flake8ify 2013-09-08 16:44:19 +05:30
Sharoon Thomas 3fad53fc8a XHR response on project 2013-09-08 16:43:54 +05:30
Sharoon Thomas 62fe465863 Improvement to create tasks over XHR 2013-09-08 13:40:10 +05:30
Sharoon Thomas b53d8711d1 Add more information to XHR responses 2013-09-08 12:15:15 +05:30
Sharoon Thomas 8fe4c4dbc6 Fix field name for serialisation 2013-09-07 20:50:25 +05:30
Sharoon Thomas 30393243d6 Add _json to attachment and commits 2013-09-07 20:47:59 +05:30
Sharoon Thomas 41a8ef8e85 Improve Serialisation of objects 2013-09-07 20:40:31 +05:30
Sharoon Thomas c747571d0e Merge pull request #34 from Abhisar/feature/task-2218 
Flake8ify nereid_project
 2013-08-17 02:10:28 -07:00
Abhisar 5e6c60a074 Flake8ify nereid_project #2218 
Task ID: project-7/task-2218

Review ID: 343001
 2013-08-17 13:09:55 +05:30
Sharoon Thomas 5f12556134 Merge pull request #35 from simmianand/feature/task-2285 
Avoid duplicate commit information on task #2285
 2013-08-17 00:14:22 -07:00
Simmi Anand 85cddbd1b2 Avoid duplicate commit information on task #2285 
* This patch searches for commit_id for specific task, if true then
  continue, else creates commit information on task

Task ID: project-7/task-2285
Issue ID: 321003
 2013-08-16 19:12:31 +05:30
Sharoon Thomas d01cde9c78 Merge branch 'release/2.6.3.0' into develop 2013-08-14 14:57:44 +05:30
Sharoon Thomas 96854c5e1c Merge branch 'release/2.6.3.0' 2013-08-14 14:57:34 +05:30
Sharoon Thomas 11ce2b20e2 Release version 2.6.3.0 2013-08-14 14:57:29 +05:30
Sharoon Thomas e1e931dd70 Merge pull request #33 from tarunbhardwaj/feature/task-2222 
Add activity for constraint change, update history _json project #2222
 2013-08-14 02:12:04 -07:00
Tarun Bhardwaj 756656850a Add activity for constraint change, update history _json project #2222 
* Add activity for constraint time change
* Update _json for history to return more data.

Review ID: 362001
 2013-08-14 14:20:22 +05:30
Sharoon Thomas b3e86f2cfc Merge pull request #32 from tarunbhardwaj/feature/task-2222 
Display activity stream on project page #2222
 2013-08-13 00:17:35 -07:00
Tarun Bhardwaj 3e3f9a7536 Display activity stream on project page #2222 
Web handler and template to show activity stream on project page

Review ID: 358001
 2013-08-13 12:08:22 +05:30
Sharoon Thomas 201c7a8649 Merge pull request #31 from simmianand/feature/task-2216 
Time marked on other task instead of current task by an employee #2216
 2013-08-09 02:34:00 -07:00
Sharoon Thomas 096ede0c38 Merge branch 'release/2.6.2.0' into develop 2013-08-09 13:57:52 +05:30