Commit Graph

1890 Commits

Author SHA1 Message Date
Jenkins for ownCloud e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Jenkins for ownCloud 5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Vincent Petry 675e3eec32 Merge pull request #9750 from owncloud/issue/9745
Correctly use groups parameter only when its not empty
2014-07-21 20:45:24 +02:00
Joas Schilling 0dc67cb1c2 Do not force isAdmin as true and so the list is filtered correctly 2014-07-21 11:30:47 +02:00
Joas Schilling e6c75aa974 Fix username for subadmins and only send subadmin groups
Fix #9748
2014-07-21 11:20:55 +02:00
Joas Schilling c84c1f519f Correctly use groups parameter only when its not empty
Fix #9745
2014-07-21 10:46:21 +02:00
Jenkins for ownCloud ddd8eae932 [tx-robot] updated from transifex 2014-07-21 01:54:30 -04:00
Morris Jobke 252c239a2a Merge pull request #9732 from owncloud/fix-9716
do not show selected groups twice after user creation
2014-07-20 16:08:39 +02:00
Jenkins for ownCloud ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Arthur Schiwon 1d39282360 $.unique works only for DOM elements 2014-07-18 21:10:19 +02:00
Jenkins for ownCloud 80983f5853 [tx-robot] updated from transifex 2014-07-18 01:54:43 -04:00
blizzz e85f078d17 Merge pull request #9705 from owncloud/ie8-userspagefix
Fixed JS and CSS issues in users page
2014-07-17 16:42:19 +02:00
Vincent Petry 4d5ebe61c4 Fixed JS and CSS issues in users page
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
2014-07-17 13:13:03 +02:00
Jenkins for ownCloud b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Stephan Peijnik 4d74aa09bf Port of #9584
Fixes #9583

lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Fix indentation.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Renamed $grp to $group in foreach loop.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Use is_null() instead of empty() when checking the return value of GroupManager::get().

Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Updated code to reflect changes introduced to \OC\Group\MetaData.

Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-16 12:23:26 +02:00
Jenkins for ownCloud 0155326227 [tx-robot] updated from transifex 2014-07-16 01:55:55 -04:00
blizzz d22904612b Merge pull request #9628 from edozzo/master
Userlist: async load doesnt fill checked group/subadmin array
2014-07-15 19:10:01 +02:00
DeLtAfOx cd97847cd6 Strinct comparsion fix 2014-07-15 13:44:41 +02:00
DeLtAfOx 26d9993b3e Userlist: async load doesnt fill checked group/subadmin array 2014-07-15 07:52:04 +02:00
Arthur Schiwon ab2c7e06a4 remove dead code
do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests
2014-07-14 21:26:37 +02:00
Jenkins for ownCloud 5dd76b510f [tx-robot] updated from transifex 2014-07-14 01:54:27 -04:00
Jenkins for ownCloud d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Jenkins for ownCloud c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04:00
Vincent Petry 4d08367b7c Merge pull request #9525 from owncloud/incrementuser2
increment/decrement group and user counts when necessary
2014-07-10 16:09:18 +02:00
Jenkins for ownCloud 77792b5b7e [tx-robot] updated from transifex 2014-07-10 04:59:40 -04:00
Thomas Müller db07c33ecd use .filterAttr() 2014-07-09 16:52:52 +02:00
Thomas Müller 56f029d524 use .filterAttr() 2014-07-09 16:48:26 +02:00
Thomas Müller 899d6eab00 some more cleanup 2014-07-09 16:36:51 +02:00
Thomas Müller b15510ed9a magic strings - bad kungfu 2014-07-09 16:13:33 +02:00
Thomas Müller 506a3400e5 remove the group in case the last user has removed from that group 2014-07-09 15:29:38 +02:00
Thomas Müller f76deb9f87 fixing JS synatx errors 2014-07-09 14:32:10 +02:00
Arthur Schiwon bdc36461a7 avoid global selector 2014-07-09 14:32:10 +02:00
Arthur Schiwon e2c935d6fb increase/decrease everyone count on user creation/deletion 2014-07-09 14:32:10 +02:00
Arthur Schiwon 5e5a02cc2f decrease user count in affected groups after user delete 2014-07-09 14:30:39 +02:00
Arthur Schiwon a584022ecc increment group counters when a user is created 2014-07-09 14:30:39 +02:00
Jenkins for ownCloud 6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04:00
Volkan Gezer 2561ef123b fix apostrophe fixes #9486 2014-07-08 21:48:29 +02:00
Jenkins for ownCloud 20fc4b8b53 [tx-robot] updated from transifex 2014-07-08 01:55:17 -04:00
Vincent Petry ec4cb56bd7 Merge pull request #9505 from stephane84/fix-9497
Refocus input field after user creation
2014-07-07 23:11:23 +02:00
Stephane V 179a707e29 Fixes #9497 2014-07-07 18:32:51 +02:00
Morris Jobke a26370e585 Merge pull request #9479 from stephane84/fix-9147
Log table design glitch in date field
2014-07-07 11:27:56 +02:00
Jenkins for ownCloud 6e9905d7cf [tx-robot] updated from transifex 2014-07-07 01:54:28 -04:00
Morris Jobke d3e65bc974 Merge pull request #9469 from owncloud/replace_uninstall_button_with_link
improvements for uninstall button
2014-07-06 23:56:44 +02:00
Stephane V e6cea04a30 Bug 9147 owncloud/core
Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
2014-07-06 16:15:33 +02:00
Jenkins for ownCloud 33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04:00
Georg Ehrke 485be909ff improvements for uninstall button 2014-07-05 13:39:25 +02:00
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Jenkins for ownCloud e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Jan-Christoph Borchardt dc15223edf Merge pull request #9390 from owncloud/fix-9368
Revert 'hides table header while users load.'
2014-07-03 13:00:40 +02:00
Jenkins for ownCloud 1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04:00
Jan-Christoph Borchardt 5a7b58ac45 Merge pull request #9374 from owncloud/link-contribute-promote
add link to contribute and promote pages in personal settings
2014-07-02 23:36:43 +02:00
Arthur Schiwon bbea031090 Revert "hides table header while users load."
This reverts commit 0dc12a3737.
2014-07-02 22:56:26 +02:00
Jan-Christoph Borchardt 03fbd6d540 remove shadow effects from settings icons, reduce size 2014-07-02 19:50:58 +02:00
Jan-Christoph Borchardt 1b83ac7de2 personal: link straight to /promote as @tomneedham said 2014-07-02 19:29:57 +02:00
Jan-Christoph Borchardt 4878c734e2 add link to contribute and promote pages in personal settings 2014-07-02 17:41:26 +02:00
Jenkins for ownCloud 9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
icewind1991 ff416eaa57 Merge pull request #9330 from owncloud/jumpingheader
Hides table header while users load in User Management
2014-07-01 15:43:31 +02:00
raghunayyar 0dc12a3737 hides table header while users load. 2014-07-01 17:05:44 +05:30
Steffen Lindner 1b871da59e Fixes typo with sendmail detection - fixes #9203 2014-06-30 15:01:12 +02:00
Joas Schilling d94d307f52 Merge pull request #9207 from owncloud/prevent-default-for-mail-test
Fix test mail behaviour
2014-06-30 11:22:20 +02:00
Jenkins for ownCloud 589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Jenkins for ownCloud ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Jenkins for ownCloud 26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Jenkins for ownCloud 36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Jenkins for ownCloud a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Morris Jobke 6e2aaaaa31 Fix test mail behaviour
* ref #8854
* prevent default of "send test mail" button
* drop unused form serialization
* use display name of user for test mail
2014-06-25 15:32:40 +02:00
Jenkins for ownCloud b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
blizzz c6bcb07f83 Merge pull request #9145 from owncloud/everyonecount
Enhancement: Displays users and admin count in the Users Management.
2014-06-24 20:58:35 +02:00
Jenkins for ownCloud 6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04:00
raghunayyar 720fa33274 Better Logic to display user count for everyone. 2014-06-24 00:50:36 +05:30
Jenkins for ownCloud b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Jenkins for ownCloud 2b4c2a7b14 [tx-robot] updated from transifex 2014-06-22 01:54:36 -04:00
Jenkins for ownCloud ca96b9d3d5 [tx-robot] updated from transifex 2014-06-20 01:54:32 -04:00
Arthur Schiwon 85894654ae Make sure last seen tooltip always appears even after searching and filtering 2014-06-19 14:30:22 +02:00
Jenkins for ownCloud e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Jenkins for ownCloud baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Morris Jobke 9e74787c8a Migrate table layout to p layout for share settings
ref #8906
2014-06-17 14:33:14 +02:00
Jenkins for ownCloud ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Volkan Gezer dd2dd7eaae Merge pull request #9059 from owncloud/simplify-warning-layout
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
Morris Jobke a5f1846170 simplify security warning on admin page 2014-06-16 20:25:02 +02:00
Morris Jobke c42d087fc5 Merge pull request #9053 from owncloud/small_ux_improvement
share settings, small ux improvement
2014-06-16 20:18:51 +02:00
Georg Ehrke 15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Bjoern Schiessle c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Arthur Schiwon f12c4f6d11 style 2014-06-16 13:46:31 +02:00
Arthur Schiwon 3ebb1565a7 escape before output, fixes #9041 2014-06-16 13:44:41 +02:00
Volkan Gezer 83b45926ee Merge pull request #8716 from owncloud/forget-documentation
app manager forgets the documentation links workaround for #8081
2014-06-16 12:24:39 +02:00
Jenkins for ownCloud ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Jenkins for ownCloud 4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Lukas Reschke 01de7b8b9e Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
Jenkins for ownCloud 4a26219ecf [tx-robot] updated from transifex 2014-06-14 01:55:24 -04:00
Morris Jobke fd5fad194d remove double space 2014-06-14 01:03:03 +02:00
Georg Ehrke c378e76412 skip certain tests for shipped apps 2014-06-13 21:45:31 +02:00
Morris Jobke dc2212cd46 migrate table layout to paragraph layout for HTTPS setting 2014-06-13 16:54:47 +02:00
Morris Jobke f5da0052cf fix mail settings save function - ref #8854 2014-06-13 15:31:35 +02:00
Jenkins for ownCloud 083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Jenkins for ownCloud 55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Jenkins for ownCloud f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Morris Jobke ecc41fe0c3 Merge pull request #8908 from owncloud/fix-placeholders
fix split translations. fix for the discussion in the description
2014-06-10 10:47:23 +02:00
Jenkins for ownCloud 6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Jenkins for ownCloud 1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Volkan Gezer e34a8bb9d6 fix hidden user group search field 2014-06-07 21:12:12 +02:00
Jenkins for ownCloud e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Volkan Gezer f56b86e857 fix split translations 2014-06-06 15:31:51 +02:00
Volkan Gezer 6f3b95052f app manager forgets the documentation links 2014-06-06 15:22:02 +02:00
Jan-Christoph Borchardt 23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Thomas Müller 289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jan-Christoph Borchardt 1745fe1664 Merge pull request #8911 from owncloud/common-lang
Add Turkish to common languages
2014-06-06 09:38:10 +02:00
Jenkins for ownCloud ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Georg Ehrke 0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Volkan Gezer 11a857f653 Add Turkish to common languages 2014-06-05 22:32:35 +02:00
Jan-Christoph Borchardt 9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Bjoern Schiessle 6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle cf9099c788 This settings doesn't belong together
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
2014-06-05 15:44:56 +02:00
Bjoern Schiessle c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Thomas Müller 1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Jan-Christoph Borchardt 218131d30d fix leading decimal Scrutinizer coding style issue 2014-06-05 10:52:06 +02:00
Jenkins for ownCloud cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Morris Jobke 39eeb7def9 Merge pull request #8882 from owncloud/remove-placeholdercall
remove obsolete placeholder call, fix #8881
2014-06-05 00:07:13 +02:00
Jan-Christoph Borchardt e26936e94f remove obsolete placeholder call, fix #8881 2014-06-04 18:44:12 +02:00
Morris Jobke 210a1ef7e6 add to app navigation after enabling 2014-06-04 18:22:40 +02:00
Jan-Christoph Borchardt 71ba457372 personal settings: unbold clients header and remove obsolete CSS 2014-06-04 17:05:44 +02:00
Georg Ehrke 724d027f19 add unit test 2014-06-04 16:29:41 +02:00
Jan-Christoph Borchardt bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00
Georg Ehrke 56a8010c9f remove console.log in apps.js 2014-06-04 09:51:43 +02:00
Jan-Christoph Borchardt 6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Jenkins for ownCloud f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
icewind1991 cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
Thomas Müller cfc1d5623e Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Jan-Christoph Borchardt 9396b22fe3 add missing placeholder shim for change password fields in IE8/9 2014-06-03 15:30:10 +02:00
Thomas Müller a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info
add info about sqlite on setup page
2014-06-03 15:07:59 +02:00
Thomas Müller 79b3558c6d Merge pull request #7151 from owncloud/user-jquery
Continuing the New User management
2014-06-03 15:04:30 +02:00
Thomas Müller a3202f1f03 bring back the line breaks 2014-06-03 12:48:36 +02:00
Jan-Christoph Borchardt de012667c7 Apps: fix wording and layout for 'enable only for specific groups' 2014-06-03 12:42:36 +02:00
Bart Visscher 49f1e4a811 Fix syntax error 2014-06-03 12:42:36 +02:00
Robin Appelman 0f82b8efb3 Preserve changed groups when switching between apps 2014-06-03 12:42:36 +02:00
Robin Appelman 953e194245 Dont show group settings for login, filesystem, etc apps after enabling them 2014-06-03 12:42:36 +02:00
Robin Appelman e3567242b2 Remove debug statements 2014-06-03 12:42:36 +02:00
Robin Appelman 7e07ff6f4f Disable enabling apps by groups for filesystem, authentication and loggin apps 2014-06-03 12:42:36 +02:00
Thomas Müller 402a31f196 adding some line breaks 2014-06-03 12:42:36 +02:00
Robin Appelman 7272779456 Prevent js error 2014-06-03 12:42:35 +02:00
Robin Appelman 53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Morris Jobke 25c676f203 simplify SQLite warning 2014-06-03 12:02:23 +02:00
Morris Jobke f88482355f check for user count and files count 2014-06-03 11:39:16 +02:00
Bjoern Schiessle 5097bcc16d improve settings name 2014-06-03 11:29:51 +02:00
Bjoern Schiessle 8e583f55dc set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app 2014-06-03 11:29:28 +02:00
Morris Jobke 68a4fd44e6 add notification on admin page 2014-06-03 08:01:39 +02:00
Jan-Christoph Borchardt c84b226cb5 add arrow icon for external links 2014-06-02 23:18:25 +02:00
Jan-Christoph Borchardt 2e6a27614e move Help section from controls bar to sidebar 2014-06-02 22:59:16 +02:00