Sam Tuke
|
c89fd49870
|
Improved folder creation code
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
|
2013-03-19 19:53:15 +01:00 |
Arthur Schiwon
|
aa3973d365
|
LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup.
|
2013-03-19 14:40:36 +01:00 |
|
Arthur Schiwon
|
0f4e02b6fc
|
LDAP: avoid irritating log output
|
2013-03-19 14:40:30 +01:00 |
|
Arthur Schiwon
|
50d0f48ee4
|
LDAP: check whether user exists for before trying to determine displayname
|
2013-03-19 14:40:23 +01:00 |
|
Arthur Schiwon
|
18fccf6612
|
LDAP: check first whether group exists in this backend before doing other operations
|
2013-03-19 14:40:15 +01:00 |
|
Arthur Schiwon
|
504f5f229f
|
LDAP: remove unnecessary func call, was a leftover from earlier refactor
|
2013-03-19 14:40:05 +01:00 |
|
Arthur Schiwon
|
f38932fb80
|
LDAP: specify appid when selecting from appconfig
|
2013-03-19 14:39:56 +01:00 |
Jenkins for ownCloud
|
63ca84e7bc
|
[tx-robot] updated from transifex
|
2013-03-19 00:05:52 +01:00 |
Bernhard Posselt
|
5b1f857907
|
Merge pull request #2363 from owncloud/uploadsize
Improve behaviour when max upload size is unknown
|
2013-03-18 08:18:27 -07:00 |
Björn Schießle
|
4a1a23ce1b
|
add some error logs to the trash bin app
|
2013-03-18 12:08:34 +01:00 |
|
Jenkins for ownCloud
|
2a48aa322d
|
[tx-robot] updated from transifex
|
2013-03-18 00:06:55 +01:00 |
|
Jenkins for ownCloud
|
1427af4a22
|
[tx-robot] updated from transifex
|
2013-03-16 22:18:26 +01:00 |
sherbrecher
|
ec45a8433d
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
apps/files_external/templates/settings.php
|
2013-03-15 17:50:02 +01:00 |
Robin Appelman
|
319e3f162c
|
Don't block uploads if the max upload size is unknown
|
2013-03-15 16:40:36 +01:00 |
|
Robin Appelman
|
32b8fd8fb7
|
Improve handeling of unlimited max upload size
|
2013-03-15 16:31:35 +01:00 |
|
sherbrecher
|
d2b3a9fb3b
|
Update settings.php
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
|
2013-03-15 15:09:55 +01:00 |
|
Björn Schießle
|
418fb98c40
|
remove backticks around table names
|
2013-03-15 12:10:21 +01:00 |
|
Björn Schießle
|
e37e884d7a
|
add backtick for db queries to prevent postgresql errors
|
2013-03-15 12:10:07 +01:00 |
Björn Schießle
|
23fe98a562
|
Merge pull request #2336 from eMerzh/fix_trashpg
Add backtick for trash app to prevent pg errors
|
2013-03-15 03:17:54 -07:00 |
Frank Karlitschek
|
92a8676350
|
Merge pull request #2317 from owncloud/create_version_on_upload
create new version if the same file is uploaded again over the web interface
|
2013-03-15 01:18:20 -07:00 |
|
Jenkins for ownCloud
|
0c123ebf9d
|
[tx-robot] updated from transifex
|
2013-03-15 00:06:36 +01:00 |
Brice Maron
|
1631aa2434
|
Add backtick for trash app to prevent pg errors
|
2013-03-15 00:03:37 +01:00 |
|
Björn Schießle
|
285d328ef1
|
use html video tag to preview videos for public shares
|
2013-03-14 20:10:21 +01:00 |
|
Björn Schießle
|
f78594c0ae
|
fix var name
|
2013-03-14 17:09:48 +01:00 |
|
Björn Schießle
|
93b2ada6f6
|
fix var name
|
2013-03-14 17:08:16 +01:00 |
|
Björn Schießle
|
0cf50d63bf
|
create new version if the same file is uploaded again over the web interface
|
2013-03-14 16:47:59 +01:00 |
|
Jenkins for ownCloud
|
9a0cb2ccaa
|
[tx-robot] updated from transifex
|
2013-03-14 00:06:29 +01:00 |
|
Bernhard Posselt
|
7d748a6b06
|
Merge pull request #2277 from owncloud/fix_sharing_hooks
listen to the pre delete hook in the sharing app [master]
|
2013-03-13 10:15:57 -07:00 |
|
Björn Schießle
|
c3ba49f384
|
Merge pull request #2265 from owncloud/no_share_option_for_shared_folder
don't add share action to the Shared folder
|
2013-03-13 08:23:35 -07:00 |
|
Björn Schießle
|
30831b6b55
|
we need to listen to the pre delete hook, otherwise the file is already gone
|
2013-03-13 15:39:39 +01:00 |
|
Björn Schießle
|
e5f40ddaae
|
only prevent shared action for the Shared folder in the root dir
|
2013-03-13 11:33:20 +01:00 |
|
Björn Schießle
|
f971ce0b66
|
let public link download handle json encoded file lists
|
2013-03-13 11:15:17 +01:00 |
|
Jenkins for ownCloud
|
f3a2daaa9d
|
[tx-robot] updated from transifex
|
2013-03-13 00:06:21 +01:00 |
|
Frank Karlitschek
|
43d15066f9
|
Merge pull request #2234 from owncloud/fix_ldap_edirectory
LDAP: compatibility with Novell eDirectory UUID
|
2013-03-12 10:21:49 -07:00 |
|
Björn Schießle
|
b2da2f769a
|
don't add share action to the Shared folder
|
2013-03-12 17:28:36 +01:00 |
|
Jenkins for ownCloud
|
569c7ab138
|
[tx-robot] updated from transifex
|
2013-03-12 00:14:05 +01:00 |
|
Arthur Schiwon
|
1e07801c95
|
LDAP: compatibility with Novell eDirectory UUID
|
2013-03-11 13:30:06 +01:00 |
|
Bernhard Posselt
|
049a4df259
|
Merge pull request #1786 from owncloud/shared-folder-etags
Include etags for the root of the shared folder
|
2013-03-11 02:38:50 -07:00 |
|
Arthur Schiwon
|
07f88424c8
|
LDAP: fancy version for release, no code change
|
2013-03-10 18:34:56 +01:00 |
Lukas Reschke
|
3c06020e3e
|
Merge pull request #2217 from owncloud/mountconfig-location
Store the global mount configuration file in the datadir
|
2013-03-10 00:25:10 -08:00 |
|
Robin Appelman
|
be4806d031
|
Store the global mount configuration file in the datadir
|
2013-03-10 02:25:03 +01:00 |
Tom Needham
|
dfbf57207d
|
Merge pull request #1584 from owncloud/ocs_multiple_methods
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
|
2013-03-09 16:59:13 -08:00 |
|
Jenkins for ownCloud
|
6bdb84ab28
|
[tx-robot] updated from transifex
|
2013-03-10 00:06:53 +01:00 |
|
Sam Tuke
|
c1f1fbda08
|
Fixed stream wrapper bugs
Switched encryptAll() to use stream-based instead of file-at-a-time encryption
Development snapshot
|
2013-03-09 19:18:34 +01:00 |
Tom Needham
|
e58dbd46fc
|
Merge in master
|
2013-03-09 00:04:33 +00:00 |
|
Jenkins for ownCloud
|
0629ff4dd9
|
[tx-robot] updated from transifex
|
2013-03-09 00:06:34 +01:00 |
Michael Gapczynski
|
e743386acf
|
Fix correctFolders and retrieve the correct storage cache
|
2013-03-08 14:27:30 -05:00 |
|
Lukas Reschke
|
546fb72b25
|
Merge pull request #2165 from owncloud/fix_2155
Offer download of whole shared dir only if it does not exceed zip input ...
|
2013-03-08 10:31:48 -08:00 |
|
Björn Schießle
|
02e2f7384e
|
not only files can be reshared but also folders
|
2013-03-08 17:32:04 +01:00 |
|
Michael Gapczynski
|
20828488bc
|
Fix share hook for updater
|
2013-03-08 10:59:22 -05:00 |
|
Björn Schießle
|
2d00d13a5d
|
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
|
2013-03-08 15:13:00 +01:00 |
|
Bernhard Posselt
|
0525bbd73c
|
Merge pull request #2189 from owncloud/versioning_sync_client
fix versioning for the sync client - distinguish between touch and write operation
|
2013-03-08 03:05:28 -08:00 |
|
Björn Schießle
|
8d26400cb5
|
remove some debug output; move code to the right function
|
2013-03-08 11:27:25 +01:00 |
|
Björn Schießle
|
45869afa5a
|
remove debug output
|
2013-03-08 10:51:28 +01:00 |
|
Jenkins for ownCloud
|
308c85090e
|
[tx-robot] updated from transifex
|
2013-03-08 00:26:35 +01:00 |
|
Michael Gapczynski
|
4826564344
|
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
|
2013-03-07 17:14:34 -05:00 |
|
Bernhard Posselt
|
d6bb627a62
|
Merge pull request #2173 from owncloud/fix-shared-storage
Fix fetching source path of shared files
|
2013-03-07 09:37:36 -08:00 |
|
Michael Gapczynski
|
a5cab28bea
|
Fix fetching source path of shared files
|
2013-03-07 11:12:59 -05:00 |
|
Frank Karlitschek
|
19073e0711
|
Merge pull request #2167 from owncloud/input-type-fix
Input type fix
|
2013-03-07 07:28:22 -08:00 |
|
Michael Gapczynski
|
4cb5cb9693
|
itemSource parameter should be fileSource
|
2013-03-07 10:00:03 -05:00 |
|
Björn Schießle
|
48bb53030c
|
distinguish between touch and write
|
2013-03-07 15:51:44 +01:00 |
|
Arthur Schiwon
|
2ae1ad23b0
|
Offer download of whole shared dir only if it does not exceed zip input limit
|
2013-03-07 15:48:10 +01:00 |
Jan-Christoph Borchardt
|
70f0e0a8da
|
Merge pull request #2162 from owncloud/trash_bin_home
let the home icon link to the files view in the trash bin
|
2013-03-07 06:26:15 -08:00 |
|
Björn Schießle
|
ba9f5f5885
|
add dirlisting var to file list
|
2013-03-07 14:54:59 +01:00 |
|
Björn Schießle
|
3970d1f875
|
remove debug output
|
2013-03-07 14:18:27 +01:00 |
|
Björn Schießle
|
4a4f705adc
|
json encode list of files
|
2013-03-07 14:15:02 +01:00 |
|
Björn Schießle
|
dda4c6bf4b
|
no dir parameter needed
|
2013-03-07 13:51:18 +01:00 |
|
Björn Schießle
|
7188303651
|
let the home icon link to the files view in the trash bin
|
2013-03-07 13:48:02 +01:00 |
|
Jenkins for ownCloud
|
97222b1de5
|
[tx-robot] updated from transifex
|
2013-03-07 00:16:59 +01:00 |
|
Michael Gapczynski
|
812e306e6e
|
Update Shared folders ETags of users with reshares
|
2013-03-06 17:33:27 -05:00 |
|
Jan-Christoph Borchardt
|
ab7dc76ff1
|
add type=text to ZIP size field, fix second part of #2097
|
2013-03-06 12:39:36 +01:00 |
|
Bernhard Posselt
|
d9a0d1d23b
|
Merge pull request #2119 from owncloud/fix_ldap_settings
LDAP: fix settings output thus make settings work again
|
2013-03-06 02:32:31 -08:00 |
|
Björn Schießle
|
82990b82a6
|
Merge pull request #2118 from owncloud/fix_1689
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
|
2013-03-06 00:38:06 -08:00 |
|
Arthur Schiwon
|
bce0c3c372
|
LDAP: move more settings stuff to template file
|
2013-03-06 08:26:33 +01:00 |
|
Michael Gapczynski
|
771e01af35
|
Move hook connectors from shared storage to app.php, add post_unshare hook
|
2013-03-05 21:57:32 -05:00 |
|
Michael Gapczynski
|
4dcbaa1d7b
|
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/appinfo/app.php
|
2013-03-05 21:54:32 -05:00 |
|
Jenkins for ownCloud
|
c1a32b5073
|
[tx-robot] updated from transifex
|
2013-03-06 00:08:33 +01:00 |
|
Arthur Schiwon
|
1e5f8b0e20
|
LDAP: fix settings output thus make settings work again
|
2013-03-05 23:43:22 +01:00 |
|
Arthur Schiwon
|
b5dc8b9ca3
|
whitespace
|
2013-03-05 21:25:59 +01:00 |
|
Arthur Schiwon
|
72c293e834
|
LDAP: implementation of displayNamesInGroup
|
2013-03-05 21:23:58 +01:00 |
|
Arthur Schiwon
|
055fadd10d
|
LDAP: escape some more chars for proper search filter, fixes #1673
|
2013-03-05 14:33:20 +01:00 |
|
Arthur Schiwon
|
b08894ba77
|
LDAP: error codes can be negative, too
|
2013-03-05 13:47:03 +01:00 |
|
Tom Needham
|
370f202251
|
Rebase to current master
|
2013-03-05 00:25:56 +00:00 |
|
Björn Schießle
|
f2b86d0227
|
make sure that $this->userId is initialized before using it as a parameter
|
2013-03-04 17:58:56 +01:00 |
|
Björn Schießle
|
e65e6a12f1
|
define key size in constructor, otherwise the key size will depend on the servers openssl conf
|
2013-03-04 15:33:38 +01:00 |
|
blizzz
|
ef70978524
|
Merge pull request #2073 from owncloud/trashbin_userHome
make trashbin work with different user homes
|
2013-03-04 04:38:24 -08:00 |
|
Björn Schießle
|
2a5d9ca9c5
|
damn copy&paste, fix wrong var name
|
2013-03-04 12:59:48 +01:00 |
|
Björn Schießle
|
d23702d324
|
make trashbin work with different user homes
|
2013-03-04 12:57:32 +01:00 |
|
Lukas Reschke
|
2a9c3c1660
|
Merge pull request #2069 from owncloud/fix_sanitize_call
use p() for the output and not for the comparison
|
2013-03-04 03:41:47 -08:00 |
|
Björn Schießle
|
05aad21b99
|
Merge pull request #2070 from owncloud/fix_quota
fix quota calculation for trash and versions
|
2013-03-04 03:33:47 -08:00 |
|
Björn Schießle
|
21bad1fcc0
|
fix type in var name
|
2013-03-04 12:33:16 +01:00 |
|
Björn Schießle
|
94dab96dba
|
fix quota calculation for trash and versions
|
2013-03-04 12:17:57 +01:00 |
|
Björn Schießle
|
ccc4102cd9
|
fix p() call
|
2013-03-04 12:12:27 +01:00 |
|
Björn Schießle
|
52919fa94b
|
use p() for the output and not for the comparison
|
2013-03-04 12:01:45 +01:00 |
|
Arthur Schiwon
|
39a94a3edc
|
LDAP: orthograophy fix
|
2013-03-04 11:44:34 +01:00 |
|
Arthur Schiwon
|
0703065e2a
|
LDAP: typos in app description
|
2013-03-04 11:29:35 +01:00 |
Bart Visscher
|
de066beaaf
|
Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares
Fix file actions including permanent shares
|
2013-03-04 01:56:23 -08:00 |
raghunayyar
|
d3ddf03687
|
Datepicker height fixed.
New id defined for files table for positioning.
|
2013-03-04 09:21:38 +05:30 |
|
Jenkins for ownCloud
|
b738aaba2a
|
[tx-robot] updated from transifex
|
2013-03-04 00:07:35 +01:00 |
|
Michael Gapczynski
|
0488968443
|
Merge pull request #2034 from owncloud/fix_bug47
Fix #47 - Duplicate files create a (2) when multiples are uploaded
|
2013-03-03 11:49:04 -08:00 |
Jörn Friedrich Dreyer
|
f4411b0243
|
durhurrrhurrr
|
2013-03-03 13:01:25 +01:00 |
|
Jenkins for ownCloud
|
844e18a8b1
|
[tx-robot] updated from transifex
|
2013-03-03 00:06:56 +01:00 |
|
Michael Gapczynski
|
e466d680fe
|
Fix variable name in Shared_Updater
|
2013-03-02 13:11:57 -05:00 |
|
Michael Gapczynski
|
9b4d7d9925
|
Update ETag when file is shared
|
2013-03-02 12:57:29 -05:00 |
|
Brice Maron
|
dbb9b68331
|
Fix quoting of query for user_ldap ref #1983
|
2013-03-02 16:26:15 +01:00 |
|
Lukas Reschke
|
d3e88e6a8c
|
Remove uneeded sanitizeHTML
|
2013-03-02 12:44:53 +01:00 |
|
Jenkins for ownCloud
|
6c96b93fd4
|
[tx-robot] updated from transifex
|
2013-03-05 00:19:07 +01:00 |
|
Lukas Reschke
|
fdb37d191b
|
Merge pull request #2092 from owncloud/infieldlabels-placeholder
explicitly add empty placeholder to inputs which use infield labels
|
2013-03-04 13:31:21 -08:00 |
|
Frank Karlitschek
|
33c62bf110
|
Merge pull request #2090 from owncloud/fixing-2089-master
fixes #2089
|
2013-03-04 13:17:35 -08:00 |
|
Jan-Christoph Borchardt
|
07dee24cb2
|
explicitly add empty placeholder to inputs which use infield labels, fix #2049
|
2013-03-04 22:11:57 +01:00 |
|
Bernhard Posselt
|
10b108ed8a
|
Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
|
2013-03-04 12:59:39 -08:00 |
|
Thomas Mueller
|
a118906f26
|
fixes #2089
|
2013-03-04 21:45:21 +01:00 |
|
Bernhard Posselt
|
8c64484c5e
|
Merge pull request #2082 from owncloud/fix-permissions-class
Change remove() $user parameter to optional
|
2013-03-04 09:03:09 -08:00 |
|
Bernhard Posselt
|
b3df526ef2
|
Merge pull request #2079 from owncloud/fix_expire_function
fix expire function
|
2013-03-04 09:01:58 -08:00 |
|
Michael Gapczynski
|
ec2a9169b9
|
Change remove() $user parameter to optional
|
2013-03-04 11:44:09 -05:00 |
|
Björn Schießle
|
70014d37dc
|
fix expire function
|
2013-03-04 17:20:14 +01:00 |
|
raghunayyar
|
d9c11a93c6
|
Corrects Files Layout in Trashbin
|
2013-03-04 21:34:50 +05:30 |
|
Jan-Christoph Borchardt
|
afe7ea8ca2
|
fix files table CSS specificity issue causing multiselect bar overlap, fix #2075
|
2013-03-04 16:10:11 +01:00 |
j-ed
|
f96eef926e
|
Update app.php
replaced fixed path to app folder to support multiple apps pathes.
|
2013-03-02 12:33:38 +01:00 |
|
j-ed
|
20a45d547a
|
Update app.php
suppress log messages like `include path for class \"OCA\\Files_Versions\\Storage\" starts with \"apps\/\"`.
|
2013-03-02 12:26:13 +01:00 |
|
j-ed
|
4c03c3a31d
|
Update app.php
suppress log messages like `include path for class \"OCA\\Files_Trashbin\\Hooks\" starts with \"apps\/\"`.
|
2013-03-02 12:24:12 +01:00 |
|
j-ed
|
5352f1e65b
|
Update app.php
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
|
2013-03-02 12:18:28 +01:00 |
|
j-ed
|
d3e0a41dad
|
Update app.php
suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
|
2013-03-02 12:14:52 +01:00 |
|
j-ed
|
2aaf38b5d3
|
Update app.php
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
|
2013-03-02 12:12:33 +01:00 |
|
Jenkins for ownCloud
|
c9d9c381ec
|
[tx-robot] updated from transifex
|
2013-03-02 00:05:42 +01:00 |
|
Thomas Mueller
|
4b9863fa7d
|
Merge branch 'master' into from-insane-autoescape-to-p
Conflicts:
apps/files/templates/index.php
|
2013-03-01 23:09:20 +01:00 |
|
Thomas Mueller
|
e3e4c28316
|
fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed
|
2013-03-01 21:43:34 +01:00 |
|
Bernhard Posselt
|
2e2cf28d30
|
Merge pull request #2005 from owncloud/trash_add_signals
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 09:41:07 -08:00 |
Georg Ehrke
|
ff9476b3e3
|
fix oc#47
|
2013-03-01 18:30:25 +01:00 |
|
Björn Schießle
|
a01540a300
|
fix getVersions() call for the history view
|
2013-03-01 13:55:10 +01:00 |
|
Björn Schießle
|
e81b6395d4
|
make sure that the version app always work on the users real home folder and not on the mount point
|
2013-03-01 13:54:26 +01:00 |
|
Björn Schießle
|
df2a9a3c60
|
add additional parameter to signal
|
2013-03-01 12:44:43 +01:00 |
|
Björn Schießle
|
7c360c2491
|
add post_moveToTrash and post_restore signals to the trash bin
|
2013-03-01 12:20:29 +01:00 |
|
Jenkins for ownCloud
|
d20fd7e9a6
|
[tx-robot] updated from transifex
|
2013-03-01 00:07:02 +01:00 |
|
Lukas Reschke
|
416607e559
|
Merge pull request #1979 from maelzx/patch-2
Fix window.location mistakes in previous code
|
2013-02-28 12:53:15 -08:00 |
|
Lukas Reschke
|
301d065686
|
Sed was wrong
|
2013-02-28 20:21:14 +01:00 |
|
Lukas Reschke
|
dee16deacd
|
Merge master
|
2013-02-28 20:03:06 +01:00 |
|
Michael Gapczynski
|
b5989c933f
|
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
|
2013-02-28 10:39:23 -05:00 |
|
Jan-Christoph Borchardt
|
6d4b344f5d
|
Merge pull request #1397 from owncloud/trash_fileactions
Enable fileactions while viewing trash
|
2013-02-28 05:43:51 -08:00 |
|
Robin Appelman
|
12fd47af39
|
Trash: fix opening folders
|
2013-02-28 13:32:08 +01:00 |
maelzx
|
a319fa8d47
|
Fix window.location mistakes in previous code
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
|
2013-02-28 11:26:42 +08:00 |
|
Jenkins for ownCloud
|
a93b5b47a1
|
[tx-robot] updated from transifex
|
2013-02-28 00:05:40 +01:00 |
|
Lukas Reschke
|
5f8bd07927
|
[Files] Use p() instead of echo
|
2013-02-27 23:40:30 +01:00 |
|
Lukas Reschke
|
b93ebe1860
|
Merge master
|
2013-02-27 23:36:52 +01:00 |
|
Lukas Reschke
|
0b5b495535
|
[user_webdavauth] From echo to p
|
2013-02-27 22:06:50 +01:00 |
|
Lukas Reschke
|
df1d90433d
|
[user_ldap] From echo to p
|
2013-02-27 22:04:57 +01:00 |
|
Bart Visscher
|
ab5e20a2c1
|
Just use rawurlencode in files list template
|
2013-02-27 21:53:46 +01:00 |
|
Lukas Reschke
|
fc5331eaec
|
[files_versions] From echo to p
|
2013-02-27 21:50:22 +01:00 |
|
Lukas Reschke
|
3ba8881bac
|
[files_trashbin] From echo to p
|
2013-02-27 21:46:37 +01:00 |
|
Lukas Reschke
|
c9415e6529
|
[files] Unescape file size
|
2013-02-27 21:40:06 +01:00 |
|
Lukas Reschke
|
221ecf63ab
|
[files_sharing] From echo to p
|
2013-02-27 21:37:14 +01:00 |
|
Lukas Reschke
|
236507a19f
|
[files_external] From echo to p
|
2013-02-27 21:31:27 +01:00 |
|
Lukas Reschke
|
7f8eddffe4
|
[files_encryption] Use p() instead of echo()
|
2013-02-27 21:20:37 +01:00 |
|
Lukas Reschke
|
85209287bb
|
[Files] Use htmlspecialchars()
|
2013-02-27 21:19:11 +01:00 |
|
Lukas Reschke
|
4860d03270
|
[Files] Use p() instead of echo
|
2013-02-27 21:14:15 +01:00 |
|
Robin Appelman
|
923c51773a
|
Trash: disable text editor from trash for now
|
2013-02-27 20:37:50 +01:00 |
|
Robin Appelman
|
f497970e30
|
Trash: fix download.php
|
2013-02-27 20:31:21 +01:00 |
|
Robin Appelman
|
d2fe600789
|
Trash: fix trash when default quota is used
|
2013-02-27 20:29:49 +01:00 |
|
Robin Appelman
|
429bf42e98
|
Merge master into trash_fileactions
|
2013-02-27 20:29:19 +01:00 |
|
Sam Tuke
|
0bc7d3bcf8
|
Added notes where to reuse old keys instead of generating new ones
|
2013-02-27 18:50:57 +00:00 |
|
Sam Tuke
|
953319a2c3
|
Made proxy class reuse existing keyfiles not gen new ones;
Added notes about reusing shareKeys
|
2013-02-27 18:46:44 +00:00 |
|
j-ed
|
1f9551a382
|
Update apps/files/templates/part.list.php
prevent multiple slashes in a row when building URLs.
|
2013-02-27 19:09:37 +01:00 |
|
Michael Gapczynski
|
766a301a6b
|
Merge pull request #1031 from owncloud/external_storage_ui_feedback
External Storage UI Improvements
|
2013-02-27 10:00:22 -08:00 |
|
Sam Tuke
|
69bc42f920
|
Deleting encrypted files with missing keyfiles/shareKeys now succeeds
|
2013-02-27 16:15:03 +00:00 |
|
Sam Tuke
|
14eae441eb
|
Unsharing a single file now works
|
2013-02-27 15:31:23 +00:00 |
|
Björn Schießle
|
f8bcd38d4d
|
remove admin settings from app.php
|
2013-02-27 15:53:08 +01:00 |
|
Björn Schießle
|
6cf147003f
|
Merge branch 'master' into versions_cleanup
|
2013-02-27 15:50:08 +01:00 |
|
Björn Schießle
|
9b220d0b93
|
rename History to Versions
|
2013-02-27 15:46:49 +01:00 |
|
Björn Schießle
|
d9e75c2b92
|
remove admin settings for versions
|
2013-02-27 15:44:02 +01:00 |
|
Jenkins for ownCloud
|
fd654e9c2f
|
[tx-robot] updated from transifex
|
2013-02-27 14:37:12 +01:00 |
|
Frank Karlitschek
|
49f2a2d25d
|
Merge pull request #1953 from owncloud/escape_regular_expressions
escape regular expressions; fix typo in variable name
|
2013-02-27 04:29:17 -08:00 |
|
Bernhard Posselt
|
a54be4acc4
|
Merge pull request #1948 from owncloud/improve_user_sorting
Sort after display name + LDAP server side sorting
|
2013-02-27 02:39:22 -08:00 |
|
Thomas Müller
|
58b06c5c9a
|
Merge pull request #1905 from owncloud/fix-share-icons
Fix adding share icons to share action
|
2013-02-27 02:31:52 -08:00 |
|
Björn Schießle
|
5c7e3cf2e2
|
escape regular expressions; fix typo in variable name
|
2013-02-27 10:51:32 +01:00 |
|
Michael Gapczynski
|
f26c477433
|
Merge pull request #1949 from owncloud/fix-dropbox
Fix undefined root parameter in Dropbox storage
|
2013-02-26 16:14:45 -08:00 |
|
Jenkins for ownCloud
|
348812f2ce
|
[tx-robot] updated from transifex
|
2013-02-27 00:09:33 +01:00 |
|
Michael Gapczynski
|
25cf18f614
|
Fix undefined root parameter in Dropbox storage
|
2013-02-26 17:52:06 -05:00 |
|
Arthur Schiwon
|
64551ee06f
|
LDAP: sort users on server-side
|
2013-02-26 22:27:09 +01:00 |
|
Sam Tuke
|
aae9b0b1bf
|
Started work on post unshare hook
Development snapshot
|
2013-02-26 18:33:31 +00:00 |
|
Sam Tuke
|
4550ae6a69
|
Shared encrypted files now readable by both sharer and sharee
|
2013-02-26 18:11:29 +00:00 |
|
Jan-Christoph Borchardt
|
07e9f8d0d3
|
remove general CSS from IE specific rules, displays Shared state permanently again
|
2013-02-26 18:49:20 +01:00 |
|
Lukas Reschke
|
c94974cb97
|
Add missing echo
|
2013-02-26 16:10:52 +01:00 |
|
Björn Schießle
|
8c9d0d1f5b
|
cleanPath needs to be public
|
2013-02-26 12:24:52 +01:00 |
|
Michael Gapczynski
|
ea83acedeb
|
Fix target path and reuse mtime
|
2013-02-26 01:43:04 -05:00 |
|
Michael Gapczynski
|
8983465210
|
Correct parent folders' ETags for all users with access to a shared file
|
2013-02-26 01:21:48 -05:00 |
|
Michael Gapczynski
|
5b50bc8c0a
|
Fix Dropbox and Google ui
|
2013-02-25 19:45:01 -05:00 |
|
Jenkins for ownCloud
|
63d9feb8c0
|
[tx-robot] updated from transifex
|
2013-02-26 00:06:26 +01:00 |
|
Michael Gapczynski
|
4a05e8820f
|
Merge branch 'master' into external_storage_ui_feedback
|
2013-02-25 17:56:40 -05:00 |
|
Bernhard Posselt
|
1d83d76b45
|
fixed bug that prevented a newly created file to be opened with registered files actions
|
2013-02-25 17:50:17 +01:00 |
|
Frank Karlitschek
|
f50be25704
|
Merge pull request #1864 from owncloud/fix_display_default
LDAP: simplify default for user home settings, fixes wrong display of de...
|
2013-02-25 08:23:32 -08:00 |
|
Björn Schießle
|
ede0e7d6bc
|
Merge pull request #1890 from owncloud/trashbin_fix
fix quota calculation for trash bin and versions
|
2013-02-25 07:59:09 -08:00 |
|
Björn Schießle
|
3ef8c0bda3
|
Merge pull request #1892 from owncloud/files_remove_row_on_delete
delete table row if file was deleted instead of just hide it
|
2013-02-25 07:44:35 -08:00 |
|
Björn Schießle
|
dbf2bfc8cd
|
delete table row if file was deleted instead of just hide it
|
2013-02-25 16:32:54 +01:00 |
|
Björn Schießle
|
b917646516
|
fix quota calculation
|
2013-02-25 16:12:44 +01:00 |
|
Björn Schießle
|
272f854ce6
|
fix getVersion call
|
2013-02-25 15:34:36 +01:00 |
|
Jörn Friedrich Dreyer
|
664e7a3fc2
|
use distance option to delay dragging in sane browsers
|
2013-02-25 15:08:14 +01:00 |
|
Björn Schießle
|
e30b3f64e0
|
fix line endings
|
2013-02-25 14:29:31 +01:00 |
|
Björn Schießle
|
4c980a4851
|
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
|
2013-02-25 14:26:59 +01:00 |
|
Björn Schießle
|
a37577e007
|
Merge pull request #1810 from owncloud/trashbin_encryption
Trashbin file encryption support
|
2013-02-25 05:13:38 -08:00 |
|
Björn Schießle
|
7da97550df
|
some final code clean-up
|
2013-02-25 14:12:56 +01:00 |
|
Björn Schießle
|
7ebbecd81f
|
always use "==="
|
2013-02-25 14:09:20 +01:00 |
|
Bernhard Posselt
|
3f48bebe92
|
Merge pull request #1827 from owncloud/fix_getVersions
fix getVersions(), we need to get the correct user and filename
|
2013-02-25 04:59:47 -08:00 |
|
Thomas Müller
|
660670ec68
|
Merge pull request #1832 from owncloud/fix_1779
use :hover pseudo class to set opacity
|
2013-02-25 04:35:34 -08:00 |
|
Thomas Müller
|
7c30c1a2e8
|
Merge pull request #1833 from owncloud/fix_1465
Fix 1465
|
2013-02-25 04:34:13 -08:00 |
|
Björn Schießle
|
ca1b94d890
|
make sure that home folders are mounted correctly before write/read keyfile
|
2013-02-25 12:29:07 +01:00 |
|
Björn Schießle
|
4dea6a6228
|
Merge branch 'master' into trashbin_encryption
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
|
2013-02-25 12:14:51 +01:00 |
|
Björn Schießle
|
632ca9f06d
|
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/lib/trash.php
|
2013-02-25 11:14:06 +01:00 |
|
Frank Karlitschek
|
9ee5069f2a
|
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
don't use the number of written bytes as indicator if streamCopy() was successful
|
2013-02-25 02:04:12 -08:00 |
|
Frank Karlitschek
|
8f65916904
|
Merge pull request #1882 from owncloud/required_version
Set required owncloud version to 4.93
|
2013-02-25 00:37:22 -08:00 |
|
Jenkins for ownCloud
|
21f3291eee
|
[tx-robot] updated from transifex
|
2013-02-25 00:06:17 +01:00 |
|
Robin Appelman
|
4e826b1673
|
Set required owncloud version to 4.93
|
2013-02-24 17:38:36 +01:00 |
|
Michael Gapczynski
|
36827d1549
|
Fix variable
|
2013-02-23 16:09:56 -05:00 |
|
Michael Gapczynski
|
00e28cf156
|
Return unknown free space for shared root folder so we can still upload partial files
|
2013-02-23 15:42:01 -05:00 |
|
Michael Gapczynski
|
b6a21cc4b5
|
Fix WebDAV uploading of partial shared files
|
2013-02-23 15:32:59 -05:00 |
|
Michael Gapczynski
|
09a2730f57
|
Include etag field for folder contents
|
2013-02-23 15:22:34 -05:00 |
|
Thomas Müller
|
a417028ccd
|
Merge pull request #1862 from owncloud/whitespace-cleanup
Whitespace cleanup
|
2013-02-23 11:39:13 -08:00 |
|
Jenkins for ownCloud
|
6aa0ecc9b8
|
[tx-robot] updated from transifex
|
2013-02-23 00:05:33 +01:00 |
|
Arthur Schiwon
|
e4e915fa3b
|
LDAP: simplify default for user home settings, fixes wrong display of default value in settings
|
2013-02-22 21:26:07 +01:00 |
|
Bart Visscher
|
bb75dfc021
|
Whitespace fixes
|
2013-02-22 19:05:36 +01:00 |
|
Björn Schießle
|
d8137fdf66
|
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
|
2013-02-22 16:43:11 +01:00 |
|
Björn Schießle
|
31c434b795
|
the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely
|
2013-02-22 16:08:08 +01:00 |
|
Jörn Friedrich Dreyer
|
e8da90d0f4
|
Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
|
2013-02-22 07:02:51 -08:00 |
|
Björn Schießle
|
40efeb9187
|
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
|
2013-02-22 16:02:27 +01:00 |
|
Björn Schießle
|
9edec542c5
|
mount users home before write/read file to it, necessary to deal with external homes
|
2013-02-22 13:15:47 +01:00 |
|
Björn Schießle
|
df76e0d1c3
|
use the same string lengths like the file cache
|
2013-02-22 10:05:08 +01:00 |
|
Bart Visscher
|
59582e0f3f
|
Fix review issues
|
2013-02-22 00:21:06 +01:00 |
|
Jenkins for ownCloud
|
734a463297
|
[tx-robot] updated from transifex
|
2013-02-22 00:08:47 +01:00 |
|
Bart Visscher
|
19c5213b53
|
Join split translated strings
|
2013-02-21 23:47:56 +01:00 |
|
Bart Visscher
|
db8dbb9847
|
Style cleanup files_versions
|
2013-02-21 23:47:21 +01:00 |
|
Bart Visscher
|
fb7de77474
|
Style cleanup files_trashbin
|
2013-02-21 23:47:21 +01:00 |
|
Bart Visscher
|
59a3238d1a
|
Style cleanup files_sharing
|
2013-02-21 23:46:50 +01:00 |
|
Björn Schießle
|
629097bee7
|
increase db fileds for usernames
|
2013-02-21 22:44:44 +01:00 |
|
Jörn Friedrich Dreyer
|
0dd7fd0599
|
IE8 does not support window.onclick
|
2013-02-21 17:38:25 +01:00 |
|
Jörn Friedrich Dreyer
|
859caee66a
|
use :hover pseudo class to set opacity
|
2013-02-21 16:52:18 +01:00 |
|
Björn Schießle
|
89ef06cd79
|
rename app to 'deleted files'
|
2013-02-21 16:34:22 +01:00 |
|
Björn Schießle
|
0a5457c550
|
fix getVersions(), we need to get the correct user and filename
|
2013-02-21 14:40:16 +01:00 |
|
Björn Schießle
|
2436d01985
|
calculate trashbin size per user
|
2013-02-21 12:37:13 +01:00 |
|
Björn Schießle
|
c24ec867f9
|
calculate versions size per user
|
2013-02-21 12:20:29 +01:00 |
|
Jenkins for ownCloud
|
dcd93a53e4
|
[tx-robot] updated from transifex
|
2013-02-21 00:15:58 +01:00 |
|
Björn Schießle
|
6aed7abfbe
|
Merge branch 'master' into trashbin_encryption
|
2013-02-21 00:05:30 +01:00 |
|
Björn Schießle
|
fc1fba2304
|
don't show empty trash bin message for sub folders
|
2013-02-21 00:02:52 +01:00 |
|
Thomas Mueller
|
3eb9cd035f
|
Merge branch 'master' into trash_bin_delete_selected
|
2013-02-20 23:46:15 +01:00 |
|
Björn Schießle
|
c1847aaf51
|
change for loop to make it hopefully work with IE
|
2013-02-20 22:32:44 +01:00 |
|
Björn Schießle
|
2d6efae257
|
update path to deleted files
|
2013-02-20 22:19:23 +01:00 |
|
Björn Schießle
|
b685aa8bcb
|
some fixes for the keyfile handling
|
2013-02-20 22:17:04 +01:00 |
|
Bernhard Posselt
|
3b9d9eea09
|
replaced for in loops with normal enumerating loops to fix #1803
|
2013-02-20 21:57:50 +01:00 |
|
Sam Tuke
|
2d267501a1
|
Development snapshot
Added comments
Added methods
|
2013-02-20 19:18:00 +00:00 |
|
Björn Schießle
|
5329c9ea31
|
update script which copies all trash bin related files to user/files_trashbin
|
2013-02-20 19:18:34 +01:00 |
|
Björn Schießle
|
5ce6d1fb57
|
reuse delete() function in expire()
|
2013-02-20 18:00:15 +01:00 |
|
Björn Schießle
|
4b5a662e09
|
delete keyfiles if file in trash bin gets deleted permanently
|
2013-02-20 17:58:04 +01:00 |
|
Frank Karlitschek
|
383194cb44
|
Merge pull request #1753 from owncloud/Extra_info
Ability for the action handler to get more info on the current file
|
2013-02-20 08:33:57 -08:00 |
|
Frank Karlitschek
|
57fbfaf86a
|
Merge pull request #1787 from maelzx/patch-1
Update apps/files_versions/js/versions.js
|
2013-02-20 08:32:36 -08:00 |
|
Björn Schießle
|
273e1a146b
|
switch to json encoded file list
|
2013-02-20 16:33:45 +01:00 |
|
Björn Schießle
|
3a364639b7
|
use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names
|
2013-02-20 15:17:32 +01:00 |
|
Björn Schießle
|
c49e73d43c
|
restore filekeys from trash bin
|
2013-02-20 15:14:32 +01:00 |
|
Björn Schießle
|
4d0df9614b
|
put all trash bin content in user/files_trashbin
|
2013-02-20 13:34:32 +01:00 |
|
Björn Schießle
|
d426a09f90
|
Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
Versioning app use new filesystem api
|
2013-02-20 03:38:37 -08:00 |
|
Jörn Friedrich Dreyer
|
05a8766cbc
|
attach on() events to external storage table, dom events in the table will always bubble up here
|
2013-02-20 12:06:08 +01:00 |
|
maelzx
|
94e5de8fd0
|
Update apps/files_versions/js/versions.js
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
|
2013-02-20 11:14:24 +08:00 |
|
Michael Gapczynski
|
3dfb1628ce
|
Include etags for the root of the shared folder
|
2013-02-19 20:42:48 -05:00 |
|
Michael Gapczynski
|
702c27b0e6
|
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
|
2013-02-19 19:12:14 -05:00 |
|
Frank Karlitschek
|
3878203679
|
Merge pull request #1731 from owncloud/unknown-freespace
Give storage backends the option to define having no known free space
|
2013-02-19 15:18:12 -08:00 |
|
Jenkins for ownCloud
|
99758dce2b
|
[tx-robot] updated from transifex
|
2013-02-20 00:03:28 +01:00 |
|
Sam Tuke
|
1b880f2f96
|
Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
Fixed bug preventing sharing with users other than 'ownCloud'
Added comments
Moved functionality into filterShareReadyUsers()
Other changes
|
2013-02-19 19:16:50 +00:00 |
|
Björn Schießle
|
686254ac11
|
move2trash() handles keyfiles
|
2013-02-19 18:45:46 +01:00 |
|
Sam Tuke
|
14ae373dfe
|
Fixed wrong array key reference
|
2013-02-19 17:42:37 +00:00 |
|
Björn Schießle
|
fd629983fa
|
remove debug output
|
2013-02-19 17:10:32 +01:00 |
|
Björn Schießle
|
109fee7673
|
remove todo, it is already solved
|
2013-02-19 14:47:45 +01:00 |
|
Björn Schießle
|
211e651d72
|
add timestamp to function call; fix trash.js to handle multiple delete operation at once
|
2013-02-19 12:38:00 +01:00 |
|
Björn Schießle
|
7bfbfe6562
|
initialize $result
|
2013-02-19 12:24:51 +01:00 |
|
Björn Schießle
|
f45b268b93
|
rebase to master
|
2013-02-19 12:16:54 +01:00 |
|
Björn Schießle
|
e6c39fc3e7
|
change $_REQUEST to $_POST; fix check if file was successfully deleted
|
2013-02-19 12:14:44 +01:00 |
|
Björn Schießle
|
95751874a1
|
Merge pull request #1740 from houqp/issue#1688
Bug fix for Issue#1688
|
2013-02-19 03:09:03 -08:00 |
|
Björn Schießle
|
ac1b2a74ef
|
add missing paramenter to post request
|
2013-02-19 11:50:29 +01:00 |
|
Björn Schießle
|
815e964362
|
use instead of
|
2013-02-19 11:49:41 +01:00 |
|
Lukas Reschke
|
3d7545269b
|
Merge pull request #1764 from owncloud/Undelete_directory_fix
Fix for Undelete directory action
|
2013-02-19 01:34:49 -08:00 |
|
Björn Schießle
|
51cef9d8f0
|
allow user to delete selected files from the trash bin permanently
|
2013-02-19 10:24:21 +01:00 |
|
Björn Schießle
|
9a93db9642
|
remove obsolete variables
|
2013-02-19 10:23:34 +01:00 |
|
Thomas Müller
|
c56542c58d
|
Merge pull request #1771 from owncloud/mountconfig
JSON mount config: no pretty print
|
2013-02-18 22:15:56 -08:00 |
|
Thomas Mueller
|
0e9b9f4f5f
|
no pretty print
|
2013-02-19 00:48:38 +01:00 |
|
Jenkins for ownCloud
|
76c4dc6296
|
[tx-robot] updated from transifex
|
2013-02-19 00:06:51 +01:00 |
|
Thomas Müller
|
d9035d4fdc
|
Merge pull request #1728 from owncloud/mountconfig
Use json for new mount configuration files
|
2013-02-18 14:56:25 -08:00 |
|
Thomas Mueller
|
f343d9d247
|
files_versions no longer contains a personal settings page -> remove the call
|
2013-02-18 23:04:22 +01:00 |
Victor Dubiniuk
|
e2f87e456f
|
Calculate size for existing directories only
|
2013-02-18 23:48:08 +03:00 |
|
Björn Schießle
|
37352bba96
|
close file handler after readdir()
|
2013-02-18 18:16:19 +01:00 |
|
Thomas Müller
|
0ab87204ec
|
Merge pull request #1759 from owncloud/redirect_fix_1737
fix redirect, use the new routing
|
2013-02-18 07:13:19 -08:00 |
Qingping Hou
|
c0ac98066e
|
check filename and timestamp in Trashbin's file_exists method
|
2013-02-18 09:49:50 -05:00 |
|
Robin Appelman
|
3bf9aa408e
|
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
|
2013-02-18 15:13:25 +01:00 |
|
Robin Appelman
|
2bbb57e429
|
merge master into mountconfig
|
2013-02-18 15:12:15 +01:00 |
|
Björn Schießle
|
4a3374ecf8
|
fix redirect, use the new routing
|
2013-02-18 14:38:29 +01:00 |
|
VicDeo
|
fde0a8b520
|
Add Ability to the app to detect more details on the file
|
2013-02-18 13:22:43 +03:00 |
|
Björn Schießle
|
efa024cc62
|
fix getUidAndFilename() function
|
2013-02-18 11:19:40 +01:00 |
|
Lukas Reschke
|
79284b8e57
|
Sanitize HTML
|
2013-02-18 08:11:59 +01:00 |
|
Jenkins for ownCloud
|
3b9796bfcc
|
[tx-robot] updated from transifex
|
2013-02-18 00:06:45 +01:00 |
|
Thomas Müller
|
8e76a98d2f
|
Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
|
2013-02-17 11:53:51 -08:00 |
|
Bernhard Posselt
|
90939c8f12
|
Merge pull request #1708 from owncloud/style-cleanup-user_ldap
Style cleanup user_ldap
|
2013-02-17 07:02:45 -08:00 |
|
Thomas Mueller
|
325746ae45
|
Merge branch 'master' into fix-googledrive
|
2013-02-17 09:41:37 +01:00 |
|
Thomas Müller
|
0f8058cb12
|
Merge pull request #1699 from owncloud/multiselect-bar-fix
fix multiselect bar offset on shared page, close #1339 finally
|
2013-02-17 00:39:16 -08:00 |
|
Thomas Müller
|
71472c21ed
|
Merge pull request #1730 from owncloud/ldap_fix_warnings
LDAP: check array with isset first to avoid warnings about undefined ind...
|
2013-02-17 00:25:40 -08:00 |
|
Jenkins for ownCloud
|
c8e7b14ab3
|
[tx-robot] updated from transifex
|
2013-02-17 00:26:17 +01:00 |
|
Qingping Hou
|
4b4b1f8692
|
Properly delete empty directories in Trashbin
Instead of checking delted file size, we do a real check.
this fixes #1688
|
2013-02-16 17:44:51 -05:00 |
|
Qingping Hou
|
50759607e4
|
add file_exists method to files_trashbin app
|
2013-02-16 17:42:06 -05:00 |
|
Frank Karlitschek
|
17d21a84b6
|
Merge pull request #1729 from owncloud/fix_1727
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
|
2013-02-16 05:48:18 -08:00 |
|
Lukas Reschke
|
4708d4549d
|
Add missing requesttoken
This is a trivial fix for a regression caused by #1648
|
2013-02-16 13:28:49 +01:00 |
|
Jörn Friedrich Dreyer
|
cad65915a7
|
look where you are typing ...
|
2013-02-16 12:55:36 +01:00 |
|
Jörn Friedrich Dreyer
|
e1700c28fa
|
pretty print json
|
2013-02-16 12:10:54 +01:00 |
|
Robin Appelman
|
d96146a017
|
Give storage backends the option to define having no known free space
When this is the case only the configured max upload size is taking into account for uploading
|
2013-02-16 03:27:50 +01:00 |
|
Arthur Schiwon
|
a28df74ee5
|
LDAP: check array with isset first to avoid warnings about undefined index
|
2013-02-16 02:33:19 +01:00 |
|
Arthur Schiwon
|
bef48bad8b
|
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727
|
2013-02-16 02:06:45 +01:00 |
|
Robin Appelman
|
6da2c6c83e
|
Create new mountconfig files in json
|
2013-02-16 01:50:40 +01:00 |
|
Robin Appelman
|
46626915ef
|
Use a parser to read custom mount configuration instead of including the php files
|
2013-02-16 01:30:44 +01:00 |
|
Jenkins for ownCloud
|
83f0c8ce61
|
[tx-robot] updated from transifex
|
2013-02-16 00:05:50 +01:00 |
|
Bart Visscher
|
6c197227d0
|
Join split translated strings
|
2013-02-15 15:58:52 +01:00 |
|
Bart Visscher
|
5616690506
|
Style cleanup files_external
|
2013-02-15 15:58:52 +01:00 |
|
Bart Visscher
|
925de78cec
|
Join split translated strings
|
2013-02-15 15:51:55 +01:00 |
|
Bart Visscher
|
92a36ca8b8
|
Join short comment lines
|
2013-02-15 15:45:34 +01:00 |
|
Jan-Christoph Borchardt
|
ac32ae79af
|
Merge pull request #1683 from owncloud/ie-fixes
IE fixes
|
2013-02-15 03:32:31 -08:00 |
|
Björn Schießle
|
08b68aac6c
|
check if glob() returns any results, fix for stable45 was already approved by pull request #1695
|
2013-02-15 12:29:52 +01:00 |
|
Jenkins for ownCloud
|
b169073169
|
[tx-robot] updated from transifex
|
2013-02-15 00:06:50 +01:00 |
|
Bart Visscher
|
1ef2ecd6e8
|
Style cleanup user_ldap
|
2013-02-14 22:16:48 +01:00 |
|
Bart Visscher
|
9058d398a7
|
Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
|
2013-02-14 12:54:36 -08:00 |
|
Jan-Christoph Borchardt
|
d1dcb282cb
|
fix multiselect bar offset on shared page, close #1339 finally
|
2013-02-14 17:40:08 +01:00 |
|
Björn Schießle
|
8c35bbcba7
|
remove debug output, fix typo in file names
|
2013-02-14 16:33:57 +01:00 |
|
Thomas Mueller
|
6a250c877f
|
fixing javascript errors IE8 in personal settings
|
2013-02-14 16:10:52 +01:00 |
|
Bart Visscher
|
f4c9d4c067
|
Merge pull request #1682 from owncloud/fix-ie8-master
Fix ie8 master
|
2013-02-14 06:10:00 -08:00 |
|
Björn Schießle
|
b05f05ec4a
|
make store function static
|
2013-02-14 14:26:49 +01:00 |
|
Björn Schießle
|
ae172ce7de
|
improved description of the trash bin app
|
2013-02-14 13:01:02 +01:00 |
|
Björn Schießle
|
bd22e948ca
|
call 'Trash bin' 'Deleted files'
|
2013-02-14 12:32:14 +01:00 |
|
Thomas Mueller
|
a03d70209f
|
fixing undefined originalEvent
|
2013-02-14 12:19:50 +01:00 |
|
Björn Schießle
|
87b98dab25
|
use new filesystem to mount users home
|
2013-02-14 11:56:41 +01:00 |
|
Jan-Christoph Borchardt
|
b8a6bca2d3
|
always show checkbox when selected, also in IE8, fix #1621
|
2013-02-14 10:40:23 +01:00 |
|
Bart Visscher
|
cd35d257bb
|
Fix NoSpaceAfterComma and SpaceBeforeComma
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
d3ef967993
|
Fix indentation style
|
2013-02-14 08:36:26 +01:00 |
|
Bart Visscher
|
5c4a804ddb
|
Fix SpaceBeforeOpenBrace errors
|
2013-02-14 08:36:26 +01:00 |
|
Jenkins for ownCloud
|
bfe6334cd9
|
[tx-robot] updated from transifex
|
2013-02-14 00:06:51 +01:00 |
|
Thomas Müller
|
e1e77fe3be
|
Merge pull request #1598 from owncloud/fixing-1424-master
Fixing 1424 master
|
2013-02-13 12:59:30 -08:00 |
|
Björn Schießle
|
5005195db0
|
create keypair for ownCloud with empty passphrase, will be used for public link shares
|
2013-02-13 17:57:45 +01:00 |
|
Björn Schießle
|
9356f9a6bf
|
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
|
2013-02-13 17:23:27 +01:00 |
|
Björn Schießle
|
4952dfe956
|
add post_unshare hook, also add public link shares to the list of user with access to a file
|
2013-02-13 14:56:39 +01:00 |
|
Arthur Schiwon
|
1e45453da2
|
LDAP: format dn before using it, not other way round. fixes #1605
|
2013-02-13 14:49:18 +01:00 |
|
Thomas Mueller
|
bc43dd704f
|
Merge branch 'master' into fixing-1424-master
Conflicts:
settings/js/users.js
|
2013-02-13 01:18:01 +01:00 |
|
Thomas Mueller
|
037c3ee4ec
|
fixing issues with UTF8 characters in translatable strings
|
2013-02-13 00:23:37 +01:00 |
|
Jenkins for ownCloud
|
68fa0b7dcc
|
[tx-robot] updated from transifex
|
2013-02-13 00:05:40 +01:00 |
|
Thomas Mueller
|
010c4c2891
|
adding spinner while talking to the backend
|
2013-02-12 23:27:31 +01:00 |
|
Thomas Mueller
|
a814361ca7
|
Merge branch 'master' into external_storage_ui_feedback
|
2013-02-12 23:01:54 +01:00 |
|
Björn Schießle
|
a692264fa4
|
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
|
2013-02-12 17:00:33 +01:00 |
|
Björn Schießle
|
d1bbb30385
|
also find users with access to the file if a folder above the actual file was already shared
|
2013-02-12 16:48:04 +01:00 |
|
Thomas Mueller
|
318c0b3408
|
user name and password need to be encoded as well
fixes #1652
|
2013-02-12 15:56:31 +01:00 |
|
Jenkins for ownCloud
|
8d9352a40d
|
[tx-robot] updated from transifex
|
2013-02-12 15:12:46 +01:00 |
|
Thomas Mueller
|
14e3d77d64
|
https://github.com/owncloud/core/pull/1598#discussion_r2976684
|
2013-02-12 13:10:26 +01:00 |