Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Objects movements #40

Merged
merged 46 commits into from
Jan 11, 2016
Merged

Objects movements #40

merged 46 commits into from
Jan 11, 2016

Conversation

iPablo
Copy link
Contributor

@iPablo iPablo commented Dec 14, 2015

Fixed #21

iPablo and others added 30 commits November 16, 2015 09:55
@iPablo
Merge branch 'concurrency-problem' into development
0690cd9
@iPablo
Added movements tests, incompletes
a404772
@iPablo
Uncomment text
e778504
@iPablo
Printers movements backend
b9d5e54
@iPablo
Fixed movement test: 1, 2, 3
93657e2
@iPablo
Now, emitters objects can be moved (Backend)
0faadab
@iPablo
Improved code and fixed some details
b987aa5
@iPablo
Now, we can move groups (backend)
2c1494d
@iPablo
Now, movements test 4 and 5 works correctly
1b97b11
@iPablo
Now we can move OUs (backend)
95dc115
@iPablo
Added new movements test
62c15cb
@iPablo
Fixed little code error
bbf1e98
@iPablo
Improved code
929b384
@iPablo
Fixed error
77e8bd0
@iPablo
Improved tests
e64c35d
@rastydnb
cut and paste repo,group,print and ou
75d4443
@rastydnb
Merge branch 'objects-movements' of github.com:Emergya/gecoscc-ui int…
faf2b46 
…o objects-movements
@rastydnb
add maintenance modal question
3b1fc51
@rastydnb
check user admin for crop and paste
a1b8ce7
@iPablo
Added function that help us to know if a related object is assigned i…
2e24cea 
…n a policy
@iPablo
Code improved
6f32370
@iPablo
Code refactored
e982235
@iPablo
Details fixed for PEP-8
0d26788
@rastydnb
refactor object movement
7e9f9f6
@iPablo
Code fixed
ca3d724
@rastydnb
fix
0a17604
@rastydnb
fix
31a5da3
@iPablo
Added translations
f866691
@rastydnb
change maintenance modal
c50ceaf
@rastydnb
Merge branch 'objects-movements' of github.com:Emergya/gecoscc-ui int…
fa99e71 
…o objects-movements
iPablo and others added 16 commits December 11, 2015 12:44
@iPablo
Fixed some details
2f6265e
@rastydnb
add mesage for non admin user
f05ef97
@rastydnb
Merge branch 'objects-movements' of github.com:Emergya/gecoscc-ui int…
00dd473 
…o objects-movements
@iPablo
fixed details
f57e719
@rastydnb
fix
50acdf0
@iPablo
Fixed error moving nodes
71643b1
@iPablo
Merge branch 'objects-movements' of https://github.com/Emergya/gecosc…
6c22cf0 
…c-ui into objects-movements
@rastydnb
fix
4953b02
@rastydnb
Merge branch 'objects-movements' of github.com:Emergya/gecoscc-ui int…
52ac6fe 
…o objects-movements
@rastydnb
fix preventDefault
61b4afb
@rastydnb
add preventDefault on maintenance modal
152203f
@iPablo
Fixed error moving emitter objects
dd1113b
@iPablo
Added translations
f7d1ce8
@iPablo
Fixed detail
7caaecb
@iPablo
Merge branch 'development' of github.com:gecos-team/gecoscc-ui into d…
c7741ec 
…evelopment
@iPablo
Merge branch 'development' into objects-movements
7293093 
Conflicts:
	gecoscc/locale/en/LC_MESSAGES/gecoscc.mo
	gecoscc/locale/en/LC_MESSAGES/gecoscc.po
	gecoscc/locale/en/LC_MESSAGES/gecoscc_js.mo
	gecoscc/locale/en/LC_MESSAGES/gecoscc_js.po
	gecoscc/locale/es/LC_MESSAGES/gecoscc.mo
	gecoscc/locale/es/LC_MESSAGES/gecoscc.po
	gecoscc/locale/es/LC_MESSAGES/gecoscc_js.mo
	gecoscc/locale/es/LC_MESSAGES/gecoscc_js.po
	gecoscc/locale/gecoscc.pot
	gecoscc/locale/gecoscc_js.pot
alfem added a commit that referenced this pull request Jan 11, 2016
@alfem
Merge pull request #40 from Emergya/objects-movements
b006653 
Objects movements
@alfem alfem merged commit b006653 into gecos-team:development Jan 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iPablo @alfem @rastydnb