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.

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

Ajaxify user list for files external stable7 #10558

Merged
merged 3 commits into from
Sep 4, 2014

Conversation

butonic
Copy link
Member

@butonic butonic commented Aug 20, 2014

backport of #8507 to stable7 as separate PR because it introduces the select2 library

…tion for files_external, fixes #7499

remove minified select2 js

show avatars for users, simpler results

remove unneeded users and groups from settings template

fix css, escape user and group names
@scrutinizer-notifier
Copy link

The inspection completed: 6 new issues, 1 updated code elements

@ghost
Copy link

ghost commented Aug 20, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6816/

@butonic butonic added 5 - To review and removed Bug labels Aug 21, 2014
@PVince81
Copy link
Contributor

@karlitschek @craigpg please confirm this backport to stable7.
I'd say this needs to wait for 7.0.3 as it's a bit late for such a big PR.

@karlitschek
Copy link
Contributor

Exactly. Please wait until next week after 7.0.2 is out.

@butonic butonic added this to the 2014-sprint-02-current milestone Aug 21, 2014
@PVince81
Copy link
Contributor

Had a quick test with 300 users and it seems to work fine 👍

Would be cool if @ser72 could also help testing this 😄

@butonic butonic self-assigned this Aug 21, 2014
@ghost
Copy link

ghost commented Aug 21, 2014

🚀 Test Passed. 🚀
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/6831/

@craigpg craigpg modified the milestones: 2014-sprint-03-next, 2014-sprint-02-current Sep 2, 2014
@PVince81
Copy link
Contributor

PVince81 commented Sep 4, 2014

Please review this backport @blizzz @LukasReschke

@LukasReschke
Copy link
Member

  • 3rdparty matches upstream
  • Permission checks are in place
  • No XSS and CSRF
  • Seems to work for me.

=> 👍

LukasReschke added a commit that referenced this pull request Sep 4, 2014
…xternal_stable7

Ajaxify user list for files external stable7
@LukasReschke LukasReschke merged commit bd5796a into stable7 Sep 4, 2014
@LukasReschke LukasReschke deleted the ajaxify_user_list_for_files_external_stable7 branch September 4, 2014 11:16
@LukasReschke
Copy link
Member

Stable6 backport is still pending review: #10576

@@ -46,8 +47,6 @@
$tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
$tmpl->assign('backends', $backends);
$tmpl->assign('personal_backends', $personal_backends);
$tmpl->assign('groups', OC_Group::getGroups());
$tmpl->assign('users', OCP\User::getUsers());
$tmpl->assign('userDisplayNames', OC_User::getDisplayNames());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line was removed in the original PR and should not be here either… will do a PR for this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants