4d53f163fd
[tx-robot] updated from transifex
2014-12-05 01:55:52 -05:00
1c369093e5
cache total user count
...
Conflicts:
apps/user_ldap/user_ldap.php
2014-12-04 19:09:13 +01:00
ee168a121d
Forward port of #12493
...
add ldap-search command to occ
Conflicts:
apps/user_ldap/appinfo/register_command.php
LDAP search filter creation changes:
1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar" when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.
trim search string before passing it on
2014-12-04 19:02:09 +01:00
a0488453ac
Merge pull request #12596 from owncloud/remove-travis-traces
...
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
1509dd1358
update error message
2014-12-04 12:01:11 +01:00
0dd44eaf27
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
2014-12-04 11:17:44 +01:00
2c5e4b3d3f
Remove last traces of travis integration
2014-12-04 10:09:13 +01:00
5aad902507
[tx-robot] updated from transifex
2014-12-04 01:54:42 -05:00
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
3fdb1937a3
Merge pull request #12382 from owncloud/enc_reorganize_folders2
...
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
6daa588e1c
Merge pull request #12556 from owncloud/add-route-for-versions
...
Add route for download of versions
2014-12-03 14:01:58 +01:00
8c8c257ce3
Merge pull request #12554 from owncloud/versions-app-autoload
...
Autoload lib files of versions app
2014-12-03 09:34:57 +01:00
af50df8912
[tx-robot] updated from transifex
2014-12-03 01:54:32 -05:00
c4e0c02526
Add route for download of versions
...
Otherwise on master it was not possible anymore to download older versions.
Fixes itself.
2014-12-02 17:52:31 +01:00
f9958153ef
Merge pull request #12333 from owncloud/delete-selected-files
...
Fix deleting non deletable files by selecting them
2014-12-02 17:32:04 +01:00
1bd018a70c
Autoload exception from files_trashbin
2014-12-02 17:26:42 +01:00
694003d147
Autoload lib files of versions app
2014-12-02 17:21:19 +01:00
9ca9acf3f8
small fixes
2014-12-02 16:08:06 +01:00
2e78217f17
delete old keys if file was moved to a different mount point
2014-12-02 16:03:54 +01:00
49cfc30359
upgrade to new folder structure
2014-12-02 16:03:54 +01:00
40badba703
[tx-robot] updated from transifex
2014-11-30 01:54:25 -05:00
83d097c524
[tx-robot] updated from transifex
2014-11-29 01:54:28 -05:00
96b0328d39
[tx-robot] updated from transifex
2014-11-28 01:55:29 -05:00
87a2aabb98
[tx-robot] updated from transifex
2014-11-27 01:54:46 -05:00
60f7a86323
Merge pull request #12448 from owncloud/no503forRoot
...
Don't show favicon to prevent iteration through subfolders
2014-11-26 17:06:43 +01:00
8af346a84d
Don't show favicon to prevent iteration through subfolders
...
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 12:38:26 +01:00
a2457b5fb9
Merge pull request #6989 from AdamWill/google-1
...
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
e8cbb8e2d8
Add js unit test
2014-11-26 12:14:35 +01:00
9c86665ef4
Dont show the delete button for selected files if one of the selected files is not deletable
2014-11-26 12:14:35 +01:00
4321d7522e
Check if files are deletable before trying to delete them
2014-11-26 12:14:35 +01:00
a90606fb14
change private/public key names for consistency reasons
2014-11-26 10:57:47 +01:00
266f1a2afa
harmonize copyright notice
2014-11-26 10:57:47 +01:00
fd86d76f98
new folder structure for keys
...
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
c749570a06
Merge pull request #12411 from owncloud/unknown-command-windows
...
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
3766d98df6
[tx-robot] updated from transifex
2014-11-26 01:54:31 -05:00
e6a7022037
Merge pull request #12410 from owncloud/no_session_for_public_share_key
...
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
0274dcba57
Replace some more "command -v" calls with the Helper method
2014-11-25 18:10:03 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
4643a5d238
replace \OC:: with \OC::->getSession()
2014-11-25 16:15:32 +01:00
1d33503487
we no longer need to keep the session open for encryption
2014-11-25 13:37:11 +01:00
917bef39b7
don't store private public-share-key in session
2014-11-25 12:32:25 +01:00
f274833403
remove unused variable
2014-11-25 10:12:10 +01:00
6fb2477fb7
Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
...
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
bc3c835f6a
Merge pull request #12390 from owncloud/use-session-in-case
...
Close session only if encryption app is not enabled
2014-11-25 09:32:16 +01:00
02095d4f20
Merge pull request #11837 from owncloud/fix-11328
...
unify count filters and introduce display name attribute detection
2014-11-24 18:13:01 +01:00
1645c8f819
use login name to verify password
2014-11-24 15:44:43 +01:00
8589079590
Close session only if encryption app is not enabled
...
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
8782b2237c
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
...
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
0edcfc1dc1
[tx-robot] updated from transifex
2014-11-24 01:54:35 -05:00
Jenkins for ownCloud
Arthur Schiwon
Morris Jobke
Bjoern Schiessle
Thomas Müller
Lukas Reschke
Joas Schilling
Robin Appelman
Robin Appelman