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

21376 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
c07c338c90 fix counting when ldapPagingSize is 0 2014-11-21 14:51:20 +01:00
Arthur Schiwon
b5e707b1bf trigger count on the correct filter 2014-11-20 18:31:40 +01:00
Arthur Schiwon
6b6147dafd phpdoc and mixed up letters 2014-11-20 18:31:40 +01:00
Arthur Schiwon
031d6c179f better readbility, no effective changes 2014-11-20 18:31:40 +01:00
Arthur Schiwon
0e6d47123a use underscore.js for undefined checks 2014-11-20 18:31:40 +01:00
Arthur Schiwon
d8bb8afee3 this happens already before counting, no need anymore 2014-11-20 18:31:40 +01:00
Arthur Schiwon
c9e865629e JS doc 2014-11-20 18:31:40 +01:00
Arthur Schiwon
4a3fe42b16 a corrected email attribute needs to be saved, not only returned 2014-11-20 18:31:39 +01:00
Arthur Schiwon
f9b4f5f4e5 to reassure that selected attributes still work, do not count all matching entries but limit it to 1 in order to make it faster 2014-11-20 18:31:39 +01:00
Arthur Schiwon
71944a59a5 detectors (email, displayname..) are now started in one place, triggered from only 2 places. more reliable structure and flow, saves requests 2014-11-20 18:31:39 +01:00
Arthur Schiwon
f725cc66a3 consolidate user count filter in wizard and user back end 2014-11-20 18:31:39 +01:00
Arthur Schiwon
cb3af1dce2 detect user display name attribute and return user count depending on its presence 2014-11-20 18:31:39 +01:00
Morris Jobke
288acb55a0 Merge pull request #12305 from owncloud/sharelist-nodelete 
Remove delete button in shared with others list
 2014-11-20 13:32:07 +01:00
Vincent Petry
6a08fca363 Merge pull request #12253 from owncloud/port-12154 
Port 12154
 2014-11-20 12:47:27 +01:00
Vincent Petry
10d0883da9 Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs 
Added function to load translations from JS
 2014-11-20 10:53:46 +01:00
Jenkins for ownCloud
fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Vincent Petry
63fa8ec69a JSHint fixes in sharedfilelistSpec unit test file 2014-11-19 17:44:05 +01:00
Vincent Petry
98ec0451be Remove delete button in shared with others list 
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.

This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
 2014-11-19 17:42:57 +01:00
Vincent Petry
ffe57d89e4 Fix l10n promises 2014-11-19 17:02:17 +01:00
Vincent Petry
1c5933c96c Better use of promise in OC.L10N.load() 2014-11-19 14:49:15 +01:00
Lukas Reschke
284ba5b688 Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2 
Show warning when invalid user was passed
 2014-11-19 14:27:32 +01:00
Lukas Reschke
1c8f9564a4 Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword 
Warn for password reset when files_encryption is enabled
 2014-11-19 13:05:02 +01:00
Morris Jobke
dc9eaf59dc Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled 
Only show undelete capability if files_trashbin is enabled
 2014-11-19 11:42:19 +01:00
Vincent Petry
cd60a27ad6 Remove stray generateUrl 2014-11-19 10:59:38 +01:00
Jenkins for ownCloud
705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Lukas Reschke
61641293f4 Only show undelete capability if files_trashbin is enabled 
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
 2014-11-18 23:06:39 +01:00
Thomas Müller
24d4d5e2a1 Merge pull request #12270 from owncloud/fix-search-label 
User management search just searches users - adjust label of input field...
 2014-11-18 22:50:05 +01:00
Thomas Müller
45e770733e Merge pull request #12272 from owncloud/drop-var_dump 
drop unneeded var_dump - fixes #9997
 2014-11-18 22:39:48 +01:00
Morris Jobke
d40bdfb35e drop unneeded var_dump - fixes #9997 2014-11-18 22:36:42 +01:00
Morris Jobke
256eff6eac User management search just searches users - adjust label of input field - fixes #10229 2014-11-18 22:12:14 +01:00
Morris Jobke
81d112fb42 Merge pull request #12261 from oparoz/patch-1 
Replace deprecated switches
 2014-11-18 18:59:34 +01:00
Lukas Reschke
3b0a7574d6 Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculation 
Use full path instead of only the filename
 2014-11-18 18:11:31 +01:00
Björn Schießle
106d0f9c75 Merge pull request #12224 from owncloud/fix_12211 
make sure that we don't find the wrong shares if a user and a group have the same ID
 2014-11-18 17:26:02 +01:00
Lukas Reschke
1b85f40cbe $file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned. 
This feature only exists on master.
 2014-11-18 17:14:26 +01:00
Olivier Paroz
cb118ce371 Replace deprecated switches 
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
 2014-11-18 15:04:01 +01:00
Lukas Reschke
309788003d Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager 
Fix type hinting for app manager
 2014-11-18 13:56:40 +01:00
Lukas Reschke
8d4e63dd7c Merge pull request #12242 from owncloud/fix-undefined-size 
Check if the size field is available
 2014-11-18 12:37:16 +01:00
Lukas Reschke
260a084d27 Add repair steps for legacy config files 
Remove all ports from the trusted domains

Conflicts:
	lib/private/repair.php
	lib/repair/repairconfig.php
 2014-11-18 12:36:03 +01:00
Lukas Reschke
d0a30b0e55 Ignore port for trusted domains 
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

Conflicts:
	lib/private/request.php
 2014-11-18 12:36:03 +01:00
Robin Appelman
0b630a37ab Fix type hinting for app manager 2014-11-18 12:22:13 +01:00
Vincent Petry
152da9796b Added function to load translations from JS 
For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
 2014-11-18 12:20:01 +01:00
Bjoern Schiessle
ea4eedd35a only users can have a display name different from the id 2014-11-18 11:46:28 +01:00
Bjoern Schiessle
01c50d242b use the new base class for unit tests 2014-11-18 11:46:28 +01:00
Bjoern Schiessle
367468ff1f make sure that we only find the shares from the correct share type if users and groups with the same ID exists 2014-11-18 11:11:49 +01:00
Bjoern Schiessle
5192641447 make sure that we don't find the wrong shares if a user and a group have the same ID 2014-11-18 11:03:08 +01:00
Morris Jobke
230e517f35 Merge pull request #12220 from owncloud/remove-unused-code 
Remove unused code
 2014-11-18 10:36:32 +01:00
Morris Jobke
36ba935381 Merge pull request #12237 from owncloud/fix-12236 
Make declaration compatible
 2014-11-18 10:30:17 +01:00
Morris Jobke
345eb62ffa center spinner 2014-11-18 10:25:16 +01:00
Lukas Reschke
8071657cd5 Merge pull request #12234 from owncloud/normalizepath-absolute-tests 
Add tests for normalizePath() with absolute paths on windows
 2014-11-18 10:24:46 +01:00
Lukas Reschke
944cd327b1 Merge pull request #9962 from owncloud/app-group-enable-remote 
Fix remote.php routes for apps that are enabled for specific groups
 2014-11-18 10:08:20 +01:00