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