Arthur Schiwon
441c600c90
remove Access as hard dependency, inject it instead
2014-08-29 11:14:16 +02:00
Arthur Schiwon
baa49cd58a
Wizad: email attribute detection
2014-08-29 11:14:16 +02:00
Jörn Friedrich Dreyer
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Robin McCorkell
bffccdbea7
Add missing 'personal' mount configuration option
2014-08-29 09:08:46 +01:00
Jenkins for ownCloud
359590d576
[tx-robot] updated from transifex
2014-08-29 01:56:59 -04:00
Clark Tomlinson
54eb2f42df
Merge pull request #10647 from owncloud/implementing_momentjs
...
Implementing momentjs
2014-08-28 11:47:37 -04:00
Vincent Petry
f4e6cd5f3e
Merge pull request #10658 from owncloud/sftp_prevent_error
...
Prevent errors on broken SFTP config
2014-08-28 17:09:36 +02:00
Clark Tomlinson
92685acf60
Implementing moment.js
...
Updating Usages
Removing unused method
Adding JS Doc
2014-08-28 09:28:45 -04:00
blizzz
6fa609325c
Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external
...
Ajaxify user list for files external
2014-08-28 13:39:21 +02:00
Arthur Schiwon
1c0cc6c7bc
fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc
2014-08-28 11:53:40 +02:00
Arthur Schiwon
dbd51d15e1
Port of #8623
...
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise will always get the same value and we end up in an infinite loop
add unit test to make sure the infinite loop never comes back
Conflicts:
apps/user_ldap/tests/wizard.php
2014-08-28 11:52:33 +02:00
Jenkins for ownCloud
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
Robin McCorkell
87167d3141
Prevent errors on broken SFTP config
2014-08-27 09:02:14 +01:00
Jenkins for ownCloud
2740908a5b
[tx-robot] updated from transifex
2014-08-27 01:54:40 -04:00
Jenkins for ownCloud
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
Clark Tomlinson
58ab105515
Merge pull request #10421 from owncloud/share-external-delete
...
Remove no longer existing files from the cache when scanning external storage
2014-08-25 11:28:50 -04:00
Vincent Petry
5e2f627d3d
Merge pull request #10108 from owncloud/files_external-allowed-backend
...
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
Lukas Reschke
f33312f767
Use AppFramework instead of custom controller
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
6202ef3258
use displayname lookup route in files_external settings
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
e09e11b93e
no need to load user display names
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
393d136faf
fix deletion of shares
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
308e8d6379
replace chosen with select2 to provide ajaxified user and group selection 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
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
bff39f796e
add select2 to app specific thirdparty
2014-08-25 11:49:23 +02:00
Vincent Petry
8ab1c84161
Merge pull request #10591 from owncloud/routes_for_files_external
...
explicit routes for files_external
2014-08-25 11:45:41 +02: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
Jörn Friedrich Dreyer
ffe54e260a
explicit routes for files_external
2014-08-22 11:51:39 +02:00
Jenkins for ownCloud
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
blizzz
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Morris Jobke
0cb189353f
Merge pull request #10548 from owncloud/encryption-app-description
...
Better description to prevent people from misunderstanding the use case of encryption app
2014-08-21 13:01:18 +02:00
Bernhard Posselt
ba8eed0788
Better description to prevent people from misunderstanding the use case
2014-08-21 12:05:56 +02:00
Jenkins for ownCloud
952fac8493
[tx-robot] updated from transifex
2014-08-21 01:56:31 -04:00
Clark Tomlinson
61f63718ce
Merge pull request #10562 from Volker-E/master
...
fixing #10561 & HTML structure
2014-08-20 17:27:25 -04:00
Lukas Reschke
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Volker E.
98d0d48b54
fix HTML structure by rmv. obsolete input end tag
2014-08-20 22:36:58 +02:00
Jörn Friedrich Dreyer
6c593c6adf
Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource
...
urlencode s3 copyObject() copysource
2014-08-20 15:48:51 +02:00
Jenkins for ownCloud
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
Clark Tomlinson
5ddea98df2
Merge pull request #10525 from owncloud/remove-download-message
...
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 14:17:15 -04:00
Jan-Christoph Borchardt
e713e97df5
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 16:44:28 +02:00
Jan-Christoph Borchardt
3d8031564e
fix multiselect bar offset on shared page
2014-08-19 15:51:10 +02:00
Lukas Reschke
381340c9b2
Add routing to user_ldap
2014-08-19 15:26:15 +02:00
Lukas Reschke
b12af9ea7f
Add routing to files_versions
2014-08-19 15:25:16 +02:00
Lukas Reschke
8524e61fcc
Add routing to files_trashbin
2014-08-19 15:24:47 +02:00
Lukas Reschke
520ee969f2
Add routing to files_encryption
2014-08-19 15:23:45 +02:00
Lukas Reschke
ad202250a8
Add routing to files_sharing
2014-08-19 15:22:54 +02:00
Lukas Reschke
f9881abf25
Use proper routes for files
2014-08-19 15:19:18 +02:00
Morris Jobke
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
Stephan Peijnik
2df52e54d7
Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
...
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
Björn Schießle
19610157d3
Merge pull request #10425 from owncloud/set_default_share_folder
...
Set default share folder
2014-08-19 10:21:21 +02:00
Björn Schießle
312ed53307
Merge pull request #10494 from owncloud/fix_upload_to_public_folder
...
set incognitoMode to true during upload to a public folder
2014-08-19 10:13:38 +02:00
Morris Jobke
df963b3ccf
Merge pull request #10492 from owncloud/hidesharesectionswhendisabled
...
Hide sharing sections in files app when sharing API is disabled
2014-08-19 08:53:19 +02:00
Jenkins for ownCloud
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
blizzz
8f7676c762
Merge pull request #10340 from owncloud/fix-9887
...
better check whether string resembles a DN, fixes #9887
2014-08-18 19:24:41 +02:00
Arthur Schiwon
97fd39e983
unify tests
2014-08-18 16:55:08 +02:00
Lukas Reschke
594078e22f
Fix copyright
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
193a0b1a17
fix broken unit tests
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c25915cde4
update unit tests with configurable share folder
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c9903f2e68
make share folder configurable
2014-08-18 16:52:48 +02:00
Bjoern Schiessle
043cd1d02b
set incognitoMode to true, getUser should always return false during public upload
2014-08-18 16:39:25 +02:00
Vincent Petry
1de5ae8845
Hide sharing sections in files app when sharing API is disabled
2014-08-18 16:33:29 +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
Lukas Reschke
283b99a42d
Merge pull request #10276 from owncloud/skip-webdavput
...
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
Morris Jobke
5498186333
Merge pull request #10447 from owncloud/share-foldericonfix
...
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
Lukas Reschke
8d112ff61f
Merge pull request #10449 from owncloud/share-clientsidesortnoservercall
...
Client side sort for sharing overview
2014-08-15 21:25:30 +02:00
Volkan Gezer
3da69ed7d0
ssl capital
2014-08-15 20:41:40 +02:00
Vincent Petry
3a99f15af2
Client side sort for sharing overview
...
Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
2014-08-15 16:52:41 +02:00
Vincent Petry
607ea636be
Fixed folder icon update routine when share owner exists
...
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Bjoern Schiessle
5a2fef4309
login as user1 before performing a test
2014-08-15 15:48:44 +02:00
Jenkins for ownCloud
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
Jan-Christoph Borchardt
f6a6f8541a
Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file
...
Compare upload limit against biggest file
2014-08-14 23:24:18 +02:00
Jörn Friedrich Dreyer
240b952333
use S3Client::encodeKey(), fixes #8325
2014-08-14 21:46:50 +02:00
Robin Appelman
a645da3640
Merge pull request #10398 from owncloud/external-share-ssl-warn
...
Give a better error message for external shares with self-signed ssl certificates
2014-08-14 16:10:29 +02:00
Robin Appelman
bbe17f35a1
Remove no longer existing files from the cache when scanning external storage
2014-08-14 14:50:52 +02:00
Björn Schießle
27d94e9273
Merge pull request #10295 from owncloud/file_actions_error_handling
...
file actions improved error handling
2014-08-14 11:44:50 +02:00
Jenkins for ownCloud
67b7160e7b
[tx-robot] updated from transifex
2014-08-14 01:55:35 -04:00
Thomas Müller
fc462c5edb
Merge pull request #10396 from owncloud/kill-filesync
...
Kill filesync.php in files/appinfo
2014-08-13 23:56:59 +02:00
Volkan Gezer
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
Robin Appelman
bba59bf815
Cast file id's to int so we can compare them properly
2014-08-13 19:18:34 +02:00
Robin Appelman
9509bc403a
Give a better error message for external shares with self-signed ssl certificates
2014-08-13 16:46:04 +02:00
Morris Jobke
cad52dbce9
Kill filesync.php in files/appinfo
...
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
2014-08-13 15:58:43 +02:00
Vincent Petry
f282a5cff0
Merge pull request #9754 from owncloud/enc_support_aes_256
...
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
Jenkins for ownCloud
609a52ebe2
[tx-robot] updated from transifex
2014-08-13 01:54:44 -04:00
Morris Jobke
d4eaa74b76
fixes from git push force
2014-08-12 21:29:05 +02:00
Bjoern Schiessle
53c5a84eac
add unit tests
2014-08-12 21:15:39 +02:00
Bjoern Schiessle
da1feafc78
fix detection of system wide mount points
2014-08-12 21:14:22 +02:00
Oliver Gasser
eb2669448d
Compare upload limit against biggest file
...
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
2014-08-12 19:46:04 +02:00
Arthur Schiwon
eb7d70fc39
adjust login test to code changes
2014-08-12 16:13:17 +02:00
Volkan Gezer
e18b0fca47
Merge pull request #10357 from owncloud/l10n-alert-fix
...
Fix alert text
2014-08-12 13:56:33 +02:00
Jenkins for ownCloud
e4221869c2
[tx-robot] updated from transifex
2014-08-12 01:56:16 -04:00
Volkan Gezer
f2a775acb8
Fix alert text
2014-08-12 01:13:30 +02:00
Volkan Gezer
4dd9414f2c
Transifex suggestion by mnestis
2014-08-11 21:31:15 +02:00
blizzz
c46b60e822
Merge pull request #9848 from dupondje/master
...
Fix memberOf detection. Fixes : #9835
2014-08-11 16:58:30 +02:00
Arthur Schiwon
fc6793f2ae
better check whether string resembles a DN, fixes #9887
2014-08-11 16:40:41 +02:00
Jean-Louis Dupond
e46fc7a18a
Fix initializing in #9848
2014-08-11 13:50:13 +02:00
Robin Appelman
86ae3bd1e7
Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name
...
use OC_Util::basename
2014-08-11 13:10:45 +02:00
Bjoern Schiessle
bc8e1ebf75
new unit test added
2014-08-11 12:03:08 +02:00