wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
23376 commits 157 branches 562 tags 714 MiB
Commit graph

2258 commits

Author SHA1 Message Date
Jenkins for ownCloud
53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Morris Jobke
0aede0f413 move hardcoded color to CSS class - for themeability 2014-08-29 17:50:59 +02:00
Jan-Christoph Borchardt
41ace03911 color quota bar yellow for feedback if usage is over 90% 2014-08-29 16:46:08 +02:00
Morris Jobke
2764ceb14c Merge pull request #9684 from owncloud/fix-9367 
Ability to show/hide last log in and storage location in user management
 2014-08-29 12:46:53 +02:00
Jenkins for ownCloud
359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Jan-Christoph Borchardt
ba841d9561 user mgmt: move 'Show storage location' and 'Show last log in' to settings area 2014-08-29 00:08:01 +02:00
Stephane V
c7c54d9361 Adds 2 checkboxes at the top of userlist in the settings, to display/hide optional columns 
This fixes #9367.
 2014-08-28 23:45:21 +02:00
Clark Tomlinson
54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs 
Implementing momentjs
 2014-08-28 11:47:37 -04:00
Clark Tomlinson
92685acf60 Implementing moment.js 
Updating Usages

Removing unused method

Adding JS Doc
 2014-08-28 09:28:45 -04:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Jenkins for ownCloud
2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Dan Callahan
6cca20fb36 Set email input field to type=email for better UX 2014-08-26 11:14:30 -05:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Jenkins for ownCloud
adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Thomas Müller
a77d468d35 Merge pull request #10584 from owncloud/simple-wizard-trusted-domains 
Add a trusted domain wizard
 2014-08-22 17:12:17 +02:00
Lukas Reschke
dd871098c5 Redirect user after clicking on link 
Use DI
 2014-08-22 16:01:03 +02:00
Jenkins for ownCloud
8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df Add a trusted domain wizard 
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.

By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
 2014-08-21 22:22:35 +02:00
Jenkins for ownCloud
952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Jenkins for ownCloud
ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade 
Don't do app upgrades in the background
 2014-08-19 13:33:38 +02:00
Morris Jobke
43266526e8 Merge pull request #10500 from owncloud/fix_userlist_settings_ajax 
properly encode groups as json, not ',' separated
 2014-08-19 10:36:10 +02:00
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
Jörn Friedrich Dreyer
a1e8dd14a1 properly encode groups as json, not ',' separated 2014-08-18 19:47:50 +02:00
Vincent Petry
a820df71ee Merge pull request #10339 from owncloud/users-defaultquotafix 
Fixed default quota field on user management page
 2014-08-18 18:50:43 +02:00
Joas Schilling
64d64610d2 Add a note about overwritewebroot when using system cron 
If the current webroot is non-empty but the webroot from the config is,
and system cron is used, the URL generator fails to build valid URLs.
So we notify the admin to set it up correctly.

Fix #9995
 2014-08-18 11:10:22 +02:00
Jenkins for ownCloud
4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese 
remove obsolete japanese lang code
 2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Jenkins for ownCloud
c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Volkan Gezer
a4b416f115 Merge pull request #10410 from owncloud/typo 
ascii typo
 2014-08-14 12:23:49 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
46309a9ee4 ascii typo 2014-08-14 00:32:08 +02:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Arthur Schiwon
4220e0c7da it does not affect gravity on planet earth, but only for tipsy 2014-08-13 14:20:14 +02:00
Jenkins for ownCloud
609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Bjoern Schiessle
c67fee3abd fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser 2014-08-12 21:15:55 +02:00
Arthur Schiwon
288b6d4071 make singleselect check for gravity wish, and make it south for default quota 2014-08-12 18:04:52 +02:00
Vincent Petry
25a8588f7b Fix default quota settings field 
The default quota settings field is initially hidden which makes it
impossible for singleSelect() to make its width measurements.

This fix uses the app navigation slide "show" event to defer the
singleSelect() initialization on the default quota field.

Refactored setQuota() into UserList._updateQuota().
Refactored duplicate event handler code into UserList.onQuotaSelect().
 2014-08-12 12:00:34 +02:00
Vincent Petry
c208796c47 Use global apps slide toggle logic 
Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
 2014-08-12 12:00:34 +02:00
Thomas Müller
3e493501da Merge pull request #9890 from owncloud/check-php-charset-master 
setting and checking default_charset in php.ini to be UTF-8
 2014-08-11 22:11:11 +02:00
Vincent Petry
173059f6d0 Fixed file list sorting 
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
 2014-08-11 13:28:53 +02:00
Thomas Müller
c42ce20054 Merge pull request #10312 from owncloud/fix-old-japanese 
fix old Japanese language code redirection
 2014-08-11 12:55:39 +02:00
Jenkins for ownCloud
411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
Volkan Gezer
bcee9d6ab7 fix old Japanese language code redirection 
ja_JP has not been updated since March and the reference
to this language should be removed. It also exists as *ja*
on Transifex
 2014-08-09 16:52:08 +02:00
Jenkins for ownCloud
2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Björn Schießle
d35bfc9a4c Merge pull request #9520 from owncloud/theme_urls 
Add ability to theme iOS and Android client URLs just like desktop URLs.
 2014-08-05 17:53:18 +02:00
Morris Jobke
54030f4eef Merge pull request #10176 from owncloud/fix-install-icon-size 
use correct app-icon class for new apps as well, fix icon size
 2014-08-05 16:04:30 +02:00
Morris Jobke
892d824804 Merge pull request #10154 from owncloud/uninstall-undefined-appitem 
Fix undefined variable when uninstalling an app
 2014-08-05 15:13:15 +02:00
Jan-Christoph Borchardt
fa9659ae69 use correct app-icon class for new apps as well, fix icon size 2014-08-05 14:23:25 +02:00
scolebrook
8c43584450 Added to personal settings page. 2014-08-05 13:16:51 +02:00
Robin Appelman
087e68b11a Fix undefined variable when uninstalling an app 2014-08-04 17:42:02 +02:00
tomneedham
7c39c02ee5 Set group usercount to 0, not '', fixes #9782 2014-08-04 13:55:33 +00:00
Robin Appelman
5c1f572149 Set maintaince mode when updating an app from the app store 2014-08-04 13:41:05 +02:00
Jenkins for ownCloud
5a2952e2eb [tx-robot] updated from transifex 2014-08-04 01:54:39 -04:00
Jenkins for ownCloud
d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Jenkins for ownCloud
c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Der-Jan
84ea393393 Fixed wrong brackets in apps settings 2014-07-30 17:23:19 +02:00
Thomas Müller
673a8bb2b8 only call exec() if allowed to 2014-07-29 16:59:40 +02:00
Jenkins for ownCloud
29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Jenkins for ownCloud
a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud
9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Jenkins for ownCloud
010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Thomas Müller
07dc0b2fdf setting and checking default_charset in php.ini to be UTF-8 2014-07-25 09:53:25 +02:00
Jenkins for ownCloud
3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
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
Georg Ehrke
eea501b847 various fixes as requested by pr reviewers 2014-06-02 21:39:15 +02:00
Frank Karlitschek
f12a5248a3 Merge pull request #8820 from owncloud/design-details 
Design details
 2014-06-02 21:26:43 +02:00
Arthur Schiwon
39982c2aea fix grouplist behaviour (blank after filtering) 2014-06-02 17:32:59 +02:00
Morris Jobke
bdfad3440c fix success status symbol to a circle 2014-06-02 17:25:08 +02:00
Morris Jobke
6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings 
make reshare settings foldable
 2014-06-02 14:37:10 +02:00
Arthur Schiwon
75cc16f2bd remove debug output 2014-06-02 12:53:59 +02:00
Arthur Schiwon
28a012410a polish JSDoc 2014-06-02 12:53:59 +02:00
Arthur Schiwon
92b8344489 replace setTimeout and clearTimeout handling by _.debounce 2014-06-02 12:53:59 +02:00
Arthur Schiwon
ec572607e1 remove group rename stuff, there is not support in the backends yet. to do for oc8. 2014-06-02 12:53:59 +02:00
Arthur Schiwon
7b63c2c036 cleanup 2014-06-02 12:53:59 +02:00
Arthur Schiwon
d030c28d69 bind undo to current deleteHandler 2014-06-02 12:53:59 +02:00
Jan-Christoph Borchardt
29ef2f7a2f user mgmt: hide group rename function because it’s not supported in the backend yet 2014-06-02 12:53:59 +02:00
ringmaster
fc7438b221 Fix UserList.empty(), use _.defer() instead of setTimeout() 2014-06-02 12:53:58 +02:00
ringmaster
4de14fe6da Javascript cleanup for groups. 2014-06-02 12:53:58 +02:00
ringmaster
c38548a1aa Rebase cleanup. 
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
 2014-06-02 12:53:58 +02:00
ringmaster
ad1c34db45 Revisions from review. 
* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
 2014-06-02 12:53:58 +02:00
ringmaster
1115d68f25 Fix broken span. 2014-06-02 12:53:58 +02:00
ringmaster
097887a659 Add the admin group to the group list data. 
Fixes the admin group disappearing from the list when updating the display as the result of a search.

This group data should probably be managed on the page entirely by the javascript GroupList object, but this seems like the interim method.
 2014-06-02 12:53:58 +02:00
ringmaster
747c011615 More specific selectors, javascript cleanup. 
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.

to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
 2014-06-02 12:53:58 +02:00
Thomas Müller
f324aa7b24 fix some jshint errors 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
1abf69893d user management: display table at full width 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
57cc51d21d user management: remove autocompletion of user/password fields, fix #8464 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
66d00cf782 user management: remove unneeded and erroneous user filter reset function 2014-06-02 12:53:57 +02:00
ringmaster
1ae8ec698b Make sure group data is returned. 2014-06-02 12:53:57 +02:00
Arthur Schiwon
f9f9550969 small fixes / cleanup 2014-06-02 12:53:57 +02:00
Lukas Reschke
f2fed6de4e Rename $accessiblegroups to $accessibleGroups 2014-06-02 12:53:57 +02:00
Lukas Reschke
8141b9181c Add space 2014-06-02 12:53:57 +02:00
Lukas Reschke
59fef54e92 Rename $accessibleusers to $accessibleUsers 2014-06-02 12:53:57 +02:00
Lukas Reschke
0067306fd6 Remove uneeded last comma 2014-06-02 12:53:57 +02:00
Lukas Reschke
b56d14260d Rename $isadmin to $isAdmin 2014-06-02 12:53:57 +02:00
Arthur Schiwon
a9bd416643 add reset button for the filter field 2014-06-02 12:53:57 +02:00
Arthur Schiwon
3ff123f247 more appropriate label 2014-06-02 12:53:57 +02:00
Arthur Schiwon
dea7f45782 stick with current group when the filter is used 2014-06-02 12:53:57 +02:00
Arthur Schiwon
7b8935abda show users whose username starts with the search pattern first 
We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
 2014-06-02 12:53:56 +02:00
Arthur Schiwon
5444a1114d cleanup 2014-06-02 12:53:56 +02:00
Arthur Schiwon
3e411c82a5 unify and consolidate group fetching method for initial template fill and ajax request 2014-06-02 12:53:56 +02:00
Arthur Schiwon
d87347e64e update GroupList when a users is added or removed to a group 2014-06-02 12:53:56 +02:00
Thomas Müller
3c9788d40c js cleanup + typos 2014-06-02 12:53:56 +02:00
Thomas Müller
d779db5aba js cleanup 2014-06-02 12:53:56 +02:00
Arthur Schiwon
08ad073cf5 make string translatable 2014-06-02 12:53:56 +02:00
Arthur Schiwon
cbcda49ee3 get translations from settings, not core 2014-06-02 12:53:56 +02:00
Arthur Schiwon
249e42c4cd enable group filtering 2014-06-02 12:53:55 +02:00
Arthur Schiwon
dbc854d8b8 Fire up server request only on typing printed or modifying characters and when the string actually changed 2014-06-02 12:53:55 +02:00
Arthur Schiwon
8df50acce7 some documentation 2014-06-02 12:53:55 +02:00
Arthur Schiwon
68dc665c65 dynamically decide whether to load 10 or 30 users 2014-06-02 12:53:55 +02:00
Arthur Schiwon
5b8ba79356 make filter work on server-side 2014-06-02 12:53:55 +02:00
Arthur Schiwon
19fd7cd9c7 When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings. 2014-06-02 12:53:55 +02:00
Arthur Schiwon
5f57d72b93 kick out deprecated and dislodged OC.Router 2014-06-02 12:53:55 +02:00
raghunayyar
fe4b1f8b10 Enhancement: Adds Group to grouplist when added via multiselect 2014-06-02 12:53:55 +02:00
raghunayyar
d3cee79b5a Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist. 2014-06-02 12:53:55 +02:00
raghunayyar
e159f7e4a9 Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings. 2014-06-02 12:53:55 +02:00
raghunayyar
7aca126086 Adds @blizzz to authors 2014-06-02 12:53:54 +02:00
Arthur Schiwon
b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
raghunayyar
b6b133237a Initial Commit with Group Toggle. 2014-06-02 12:53:54 +02:00
Arthur Schiwon
cfba7e20cf don't hide add group when text is entered (except for ESC press) 2014-06-02 12:53:54 +02:00
Arthur Schiwon
853ced644d hide Add Group when clicking away or pressing ESC 2014-06-02 12:53:54 +02:00
Arthur Schiwon
a4cfa95545 restructure group.js and put functions to object, also add group list sorting after adding. 2014-06-02 12:53:54 +02:00
Arthur Schiwon
480173569f put Add Group elements hiding and showing into its own function 2014-06-02 12:53:54 +02:00
Arthur Schiwon
330dfeb46b group name input shall not vanish upon click, plus cleanup (groups do not have home folders) 2014-06-02 12:53:54 +02:00
Arthur Schiwon
749afe74df when clicking on Add Group also put the focus into the group name field 2014-06-02 12:53:54 +02:00
Arthur Schiwon
faab6c095c move group-click initialization to groups.js and only react on elements with a data-gid attribute given 2014-06-02 12:53:54 +02:00
raghunayyar
65aa20433c Enhancement : Toggle Add Group on Click, @blizzz have a look here. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
17e640af22 set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
506e065f23 stricter test for 0 2014-06-02 12:53:53 +02:00
Arthur Schiwon
004dd73c5e fix user creation, checkSubAdminUser is only available in OC_JSON 2014-06-02 12:53:53 +02:00
Arthur Schiwon
b3221f0e4e LDAP: adjust main template according to PR 7291 2014-06-02 12:53:53 +02:00
raghunayyar
eed108ec1b Enhancement : The edit icon looks like files app rename fileaction. 2014-06-02 12:53:53 +02:00
raghunayyar
6526b939d3 Enhancement: Transparency added to icons, changes opacity to 1 on hover. 2014-06-02 12:53:53 +02:00
raghunayyar
ceb6c4df04 Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions. 2014-06-02 12:53:53 +02:00
raghunayyar
d51b384c0c Enhancement: Always show edit & delete for the active group. 2014-06-02 12:53:53 +02:00
raghunayyar
f946a52819 Rename and Delete Happens only on Active Group. 2014-06-02 12:53:53 +02:00
Arthur Schiwon
d650cd66dc mark selected group active 2014-06-02 12:53:53 +02:00
Arthur Schiwon
1f4bc7cb10 port scroll improvements 2014-06-02 12:53:52 +02:00
Arthur Schiwon
f7903e92be do not forget to pass parameters to subtemplate 2014-06-02 12:53:52 +02:00
Lukas Reschke
86d3cf53d1 Let's switch to OCP\JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke
ed1a23c9a2 Use OCP\JSON instead of OC_JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke
8a8800203e Remove legacy "Check for user comment" 
I don't think these comments are necessary anymore and therefore they should get killed.
 2014-06-02 12:53:52 +02:00
raghunayyar
16fb48f2eb Adds admin check on groupname changes. 2014-06-02 12:53:52 +02:00
raghunayyar
63645461f0 Fixes Markup in templates. 2014-06-02 12:53:52 +02:00
raghunayyar
9ba4a76214 resolving conflict when picking 8b81a0b 2014-06-02 12:53:52 +02:00
Arthur Schiwon
bf88bd108e do not show 0 when administered group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon
1734cc09fd sort groups by user count 2014-06-02 12:53:52 +02:00
Arthur Schiwon
7d3ac194e3 do not show 0 when group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon
478393e15a load groups when clicking on them 2014-06-02 12:53:52 +02:00
raghunayyar
e681e1eec0 Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group 2014-06-02 12:53:51 +02:00
raghunayyar
f751e0bc48 Splits Code for Users and Groups. 2014-06-02 12:53:51 +02:00
Arthur Schiwon
3a92d48104 reduce template function calls 2014-06-02 12:53:51 +02:00
Arthur Schiwon
57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar
970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon
dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar
dc1523355b Adds Admin to Grouplist Everywhere 2014-06-02 12:52:53 +02:00
raghunayyar
4a30665ec3 Removes Delete Icon from Admin Group. 2014-06-02 12:52:53 +02:00
raghunayyar
8e4bbe8297 Adds class button to fix font sizes. 2014-06-02 12:52:53 +02:00
raghunayyar
8e34316e04 Fixes User Search by username. 2014-06-02 12:52:53 +02:00
raghunayyar
c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar
223e342664 Fixes delete icon only on hover. 2014-06-02 12:52:52 +02:00
raghunayyar
78e1b71003 Reverts Bogus Changes. 2014-06-02 12:52:52 +02:00
raghunayyar
71160ff853 Deletes Group Clientside Effectively. 2014-06-02 12:52:52 +02:00
raghunayyar
ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
raghunayyar
b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
raghunayyar
b2ca595509 Add GroupList Ajax to Users. 2014-06-02 12:52:52 +02:00
raghunayyar
43ced8c6c7 Splits Controls overlap in files and users. 2014-06-02 12:52:52 +02:00
raghunayyar
0663d954e6 resolve conflicts while picking c0fb623 2014-06-02 12:52:52 +02:00
Jenkins for ownCloud
d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Georg Ehrke
020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Georg Ehrke
c8636ca4d9 Merge branch 'master' into update_shipped_apps_from_appstore 
Conflicts:
	lib/private/app.php
	lib/private/installer.php
 2014-05-31 14:55:00 +02:00
Georg Ehrke
2bcfd8e084 make it possible to update shipped apps via the appstore 2014-05-31 12:17:54 +02:00
Jenkins for ownCloud
cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Thomas Müller
555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working 
Check if ReflectionMethod::getDocComment is working
 2014-05-30 22:17:30 +02:00
Volkan Gezer
4843d13056 prevent pageload if pressed enter on name email change 2014-05-30 15:12:39 +02:00
Jenkins for ownCloud
929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Lukas Reschke
5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes 
Design detail fixes
 2014-05-29 21:54:15 +02:00
Volkan Gezer
c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Jenkins for ownCloud
368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Joas Schilling
dc83b17f49 Fix double "saved" message when changing email settings 2014-05-28 11:50:55 +02:00
Jenkins for ownCloud
80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Volkan Gezer
e70ed36d8e Merge pull request #8740 from owncloud/l10n-forgotten-tags 
reverts 188c543
 2014-05-27 14:47:21 +02:00
Volkan Gezer
1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Vincent Petry
17276af6ad Merge pull request #8733 from owncloud/l10n-forgotten-tags 
unwrapped strings fix
 2014-05-27 11:55:33 +02:00
Jenkins for ownCloud
a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Volkan Gezer
188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Jenkins for ownCloud
790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Jenkins for ownCloud
3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Jenkins for ownCloud
2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Jan-Christoph Borchardt
c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Jan-Christoph Borchardt
b1ccfcde9e fix border-radius in settings to 3px 2014-05-23 18:07:25 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Jenkins for ownCloud
40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Thomas Müller
30f1ec2521 Merge branch 'master' into test_annotations_working 
Conflicts:
	lib/private/util.php
 2014-05-19 21:42:30 +02:00
Jenkins for ownCloud
d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Jenkins for ownCloud
a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Björn Schießle
b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password 
allow admin to enforce passwords for public link shares
 2014-05-16 12:23:01 -04:00
Bjoern Schiessle
b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry
1fb0d5412c Merge pull request #6260 from owncloud/jan-navigation-filesidebar 
Files app navigation sidebar
 2014-05-16 13:00:35 +02:00
Jenkins for ownCloud
43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Vincent Petry
9ccb3279dd Added app navigation for files app 
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
 2014-05-15 17:51:04 +02:00
Vincent Petry
3daaf6ba4f Merge pull request #8597 from owncloud/l10n-fix-typo 
fix typo encryption
 2014-05-15 10:05:37 +02:00
Jenkins for ownCloud
d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Volkan Gezer
5291f47c66 fix typo encryption 2014-05-15 01:29:14 +02:00
Björn Schießle
dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements 
Sharing ux improvements
 2014-05-14 12:54:27 -04:00
Björn Schießle
b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys 
backup the encryption key after the encryption was disabled
 2014-05-13 09:25:16 -04:00
Bjoern Schiessle
a9ac11718e backup the encryption key after the encryption was disabled so that the user 
can restore them if needed
 2014-05-13 12:35:25 +02:00
Bjoern Schiessle
ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Thomas Müller
e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Jenkins for ownCloud
f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04:00
Jenkins for ownCloud
b6d76e9985 [tx-robot] updated from transifex 2014-05-11 01:57:00 -04:00
Thomas Müller
b7981910f7 adopt new settings style 2014-05-09 22:53:01 +02:00
Thomas Tanghus
287c8981bc Check if ReflectionMethod::getDocComment is working 2014-05-09 22:44:55 +02:00
Jenkins for ownCloud
283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00
Jenkins for ownCloud
cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Jenkins for ownCloud
17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Jenkins for ownCloud
654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Jenkins for ownCloud
b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Thomas Müller
e27dc5b6f9 Merge pull request #8309 from DavidPrevot/chosen 
Adapt chosen (css) path
 2014-04-28 12:34:40 +02:00
Jenkins for ownCloud
642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Jenkins for ownCloud
8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Jenkins for ownCloud
c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Volkan Gezer
ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
Jenkins for ownCloud
3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Bjoern Schiessle
6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Jenkins for ownCloud
435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Jenkins for ownCloud
3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
David Prévot
eebb756c38 Adapt chosen (css) path 
Avoid shipping duplicate files in 3rdparty/css.

3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.

Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
 2014-04-22 14:15:09 -04:00
Thomas Müller
54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Jenkins for ownCloud
a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Lukas Reschke
e88731a477 Some more PHPDoc fixes 2014-04-21 15:44:54 +02:00
Jenkins for ownCloud
4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Lukas Reschke
eecd4bd18e Use JS as content-type due to mimesniffing 2014-04-17 10:40:19 +02:00
Jenkins for ownCloud
23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Volkan Gezer
1903895172 Make email display name change translatable again 2014-04-15 00:27:54 +02:00
Jenkins for ownCloud
2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Jenkins for ownCloud
982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
Björn Schießle
10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app 
Fix some localization issues with file encryption/decryption strings
 2014-04-11 17:22:13 +02:00
Jenkins for ownCloud
7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Joas Schilling
e79a027e77 Always define sendmail_is_available 
Fix #8048
 2014-04-09 10:18:46 +02:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller
647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
Jenkins for ownCloud
e295d48fd4 [tx-robot] updated from transifex 2014-04-07 01:56:11 -04:00
Volkan Gezer
286323f7a4 Fix some localization issues with file encryption/decription strings 2014-04-05 19:28:53 +02:00
Lukas Reschke
33a2aa8865 Delete oauth.css 2014-04-04 22:38:16 +02:00
Lukas Reschke
b2f8e34388 Remove uneeded file 
This file seems not to be actually used anywhere.
 2014-04-04 22:14:51 +02:00
Jenkins for ownCloud
0805f678cc [tx-robot] updated from transifex 2014-04-04 01:57:01 -04:00
Thomas Müller
20f26068e7 Merge pull request #7476 from owncloud/type-hinting 
Type hinting
 2014-04-03 20:02:27 +02:00
Jan-Christoph Borchardt
5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Jenkins for ownCloud
73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04:00
Morris Jobke
bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps 
Makes #app-navigation a part of app management.
 2014-04-01 21:38:43 +02:00
blizzz
a179335775 Merge pull request #7940 from owncloud/settings-userlistajaxcallfix 
Fixed user list offset call
 2014-04-01 14:17:05 +02:00
Vincent Petry
5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2 
remove pl_PL - fixes #7973
 2014-04-01 12:38:47 +02:00
Vincent Petry
18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock 
Replace personalblock with .section
 2014-04-01 11:20:16 +02:00
Jenkins for ownCloud
7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Bart Visscher
6b061c236d Merge branch 'master' into type-hinting 
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
 2014-03-31 21:38:54 +02:00
Thomas Müller
fe2c6f4e6d remove pl_PL - fixes #7973 2014-03-31 18:03:42 +02:00
Morris Jobke
ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes 
Fix input sizes
 2014-03-31 15:56:19 +02:00
Jan-Christoph Borchardt
2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
raghunayyar
881c66df52 Removes highlighting of selected items, padding from apps management. 2014-03-30 15:48:47 +05:30
Jenkins for ownCloud
bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Jenkins for ownCloud
915fa3da74 [tx-robot] updated from transifex 2014-03-29 01:55:44 -04:00
Vincent Petry
82f98fb3d3 Fixed user list offset call 2014-03-28 18:12:34 +01:00
Thomas Müller
5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master 
Load apps proper master
 2014-03-28 10:33:55 +01:00
Jenkins for ownCloud
ccc55f40e6 [tx-robot] updated from transifex 2014-03-28 01:55:47 -04:00
Jan-Christoph Borchardt
53b1e4a00b remove additional radio button width declaration 2014-03-27 17:13:12 +01:00
Jan-Christoph Borchardt
5b2abb32a6 remove CSS rules for personalblock, remove it from core 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
Jenkins for ownCloud
ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Thomas Müller
1816f43722 Merge pull request #7864 from owncloud/routing-performance 
Routing performance
 2014-03-25 23:00:36 +01:00
Thomas Müller
4900ad9119 update type hint in PHPDoc 2014-03-25 22:59:42 +01:00
Vincent Petry
5111fad006 Merge pull request #7689 from owncloud/last_cron_log 
Log last cron execution
 2014-03-25 19:17:36 +01:00
Thomas Müller
f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Müller
531c9564b3 Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master 
idn have to be converted before being used
 2014-03-25 12:38:32 +01:00
Jenkins for ownCloud
b92dad992f [tx-robot] updated from transifex 2014-03-25 01:55:34 -04:00
Thomas Müller
3eb5898f7b use \OC_Mail::validateAddress() to validate the email address - fixes #7862 2014-03-24 15:35:07 +01:00
raghunayyar
3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
Jenkins for ownCloud
abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Jenkins for ownCloud
0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
kondou
e6b4d28229 Move success/error squircles to settings 2014-03-21 20:27:22 +01:00
kondou
dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
Jenkins for ownCloud
bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
raghunayyar
59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
Jenkins for ownCloud
3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Jenkins for ownCloud
7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Vincent Petry
b75ca9fb50 Display admin option for public upload with encryption enabled 
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
 2014-03-18 11:28:56 +01:00
Jenkins for ownCloud
518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Jenkins for ownCloud
c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud
b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Morris Jobke
3c03ff5bb5 Merge pull request #7340 from owncloud/hide_remove_image_avatar 
Hide remove image, if there's no custom avatar
 2014-03-13 13:20:00 +01:00
Jenkins for ownCloud
1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Vincent Petry
5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559 
Hide QMail when not selected and hide SendMail when not available on the server
 2014-03-12 18:32:38 +01:00
kondou
556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00