Michael Gapczynski
|
f144be8857
|
Don't mount shared storage unless there are shared files
|
2013-01-03 11:37:19 -05:00 |
|
Michael Gapczynski
|
4e1923b01e
|
Merge pull request #1067 from owncloud/fix-logout
Check if oc_token cookie exists during logout
|
2013-01-03 08:36:19 -08:00 |
Robin Appelman
|
e40be93e87
|
merge master into filesystem
|
2013-01-03 15:59:17 +01:00 |
Thomas Müller
|
b673748151
|
Merge pull request #1063 from owncloud/translate_not_enough_space_available
add translation call for 'Not enough space available' upload error
|
2013-01-03 06:46:36 -08:00 |
Jörn Friedrich Dreyer
|
fc64e8ec58
|
fix error when wrong dir was specified
|
2013-01-03 13:34:56 +01:00 |
|
Jörn Friedrich Dreyer
|
f19787f84c
|
move $l to top
|
2013-01-03 12:00:07 +01:00 |
|
Jörn Friedrich Dreyer
|
ea732e5b29
|
also translate 'No file was uploaded. Unknown error'
|
2013-01-03 11:57:17 +01:00 |
|
Michael Gapczynski
|
ce443818d4
|
Check if oc_token cookie exists before trying to use it
|
2013-01-02 19:59:04 -05:00 |
|
Thomas Mueller
|
045c0acc92
|
workaround for 32-bit systems to handle filesizes bigger than 2GB
|
2013-01-03 00:38:44 +01:00 |
|
Robin Appelman
|
6a6d6756b7
|
Cache: rename index to prevent colissions with old fscache indexes
|
2013-01-03 00:29:10 +01:00 |
|
Thomas Mueller
|
34e5cb5070
|
fixing indent
|
2013-01-03 00:13:30 +01:00 |
|
Jenkins for ownCloud
|
3bcdd8c900
|
[tx-robot] updated from transifex
|
2013-01-03 00:05:19 +01:00 |
|
Thomas Müller
|
e0e7c98100
|
Merge pull request #1041 from owncloud/fixing-856-master
Fixing #856 master
|
2013-01-02 14:58:54 -08:00 |
|
Thomas Müller
|
9dc5ea172e
|
Merge pull request #975 from irgsmirx/patch-1
Update lib/util.php
|
2013-01-02 14:01:38 -08:00 |
|
Thomas Mueller
|
3ea9432d43
|
fixing undefined variable $l
|
2013-01-02 22:15:43 +01:00 |
|
Jörn Friedrich Dreyer
|
0405edc798
|
add translation call for 'Not enough space available' upload error
|
2013-01-02 21:00:50 +01:00 |
|
Michael Gapczynski
|
a068ddff64
|
Use the sub storage's permission cache for retrieving the correct permission
|
2013-01-02 14:40:06 -05:00 |
|
Jörn Friedrich Dreyer
|
8240717309
|
Merge pull request #1062 from owncloud/fix-1048-master
add smtp port configuration option
|
2013-01-02 10:48:58 -08:00 |
|
Thomas Mueller
|
1727b2e84d
|
add smtp port configuration option
|
2013-01-02 19:04:08 +01:00 |
|
Jörn Friedrich Dreyer
|
166da88b73
|
Merge pull request #945 from owncloud/fix_app_management_in_ie8
since @tanghus and @DeepDiver1975 gave me their 👍 I'll merge this now: Fix app management in ie8
|
2013-01-02 08:17:28 -08:00 |
|
Robin Appelman
|
54f6f1e6b7
|
phpdoc fixes for public api
|
2013-01-02 16:38:20 +01:00 |
|
Jörn Friedrich Dreyer
|
5b07e722cb
|
combine ie8 fix with debug check
|
2013-01-02 12:21:30 +01:00 |
|
Jörn Friedrich Dreyer
|
ed06070741
|
omit type attribute in script tag to use fallback (text/javascript)
|
2013-01-02 12:13:07 +01:00 |
|
Jörn Friedrich Dreyer
|
e998da06d1
|
fix broken console.log in ie8
|
2013-01-02 12:13:07 +01:00 |
|
Jenkins for ownCloud
|
516464ba94
|
[tx-robot] updated from transifex
|
2013-01-02 00:05:14 +01:00 |
|
Michael Gapczynski
|
a1f7c28e28
|
Use the source Scanner for shared storage when the path is specified
|
2013-01-01 14:47:25 -05:00 |
|
Michael Gapczynski
|
fe90130618
|
Initialize storageId variable in shared cache
|
2013-01-01 14:24:18 -05:00 |
|
Robin Appelman
|
a164fd160f
|
Cache: provide path hints to getCache/etc where available
|
2013-01-01 20:20:20 +01:00 |
|
Robin Appelman
|
04f83e3b53
|
Cache: optional path argument for getCache/Scanner/etc
|
2013-01-01 20:20:20 +01:00 |
|
Michael Gapczynski
|
268c7acfc4
|
Actually add Shared_Watcher
|
2013-01-01 13:16:42 -05:00 |
|
Michael Gapczynski
|
3b67613afc
|
Remove Shared_Scanner and add Shared_Watcher instead
|
2013-01-01 12:43:38 -05:00 |
|
Michael Gapczynski
|
f4e4a06826
|
Forgot to select storage from filecache
|
2013-01-01 12:17:54 -05:00 |
|
Robin Appelman
|
0ac78a6411
|
Share: fix cache put function
|
2013-01-01 18:10:38 +01:00 |
|
Robin Appelman
|
4b65dd608a
|
Share: small phpdoc fixes
|
2013-01-01 18:07:10 +01:00 |
|
Robin Appelman
|
b41189de44
|
Cache: allow storage backends to overwrite Watcher
|
2013-01-01 18:04:29 +01:00 |
|
Michael Gapczynski
|
f2ca7023e1
|
Fix Shared root problems with Watcher and Quota proxy
|
2013-01-01 11:19:33 -05:00 |
|
Michael Gapczynski
|
d0a50fae83
|
Fix eTagUpdate and add tests
|
2012-12-31 18:16:44 -05:00 |
|
Jenkins for ownCloud
|
c6064a542c
|
[tx-robot] updated from transifex
|
2013-01-01 00:04:42 +01:00 |
Tom Needham
|
3d23e98390
|
Remove the WIP external sharing api
|
2012-12-31 16:31:22 +00:00 |
|
Tom Needham
|
8a5f583cac
|
Remove WIP OAuth code
|
2012-12-31 16:19:46 +00:00 |
|
Tom Needham
|
2ac616682e
|
Remove accidental submodule
|
2012-12-31 16:09:37 +00:00 |
|
Tom Needham
|
9626d9ce31
|
Code cleanup and add copyright info
|
2012-12-31 16:08:21 +00:00 |
|
Tom Needham
|
6eb194b702
|
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
|
2012-12-31 15:47:15 +00:00 |
|
Tom Needham
|
218a5ea890
|
Remove unused methods
|
2012-12-31 14:16:29 +00:00 |
|
Michael Gapczynski
|
aea8b0ff5c
|
Merge branch 'filesystem' into filesystem-etags
Conflicts:
lib/files/cache/updater.php
|
2012-12-30 21:26:48 -05:00 |
|
Michael Gapczynski
|
29b82ccdf3
|
Change length of etag field to 40
|
2012-12-30 21:23:54 -05:00 |
|
Michael Gapczynski
|
96e08a1d96
|
Fix function name
|
2012-12-30 21:23:17 -05:00 |
|
Michael Gapczynski
|
3ee3323b87
|
Fix retrieving of cache and scanner in Updater class
|
2012-12-30 20:27:38 -05:00 |
|
Michael Gapczynski
|
77f12c526b
|
Update etags in parent folders
|
2012-12-30 19:54:51 -05:00 |
|
Michael Gapczynski
|
83064aca51
|
Remove old etag code
|
2012-12-30 19:23:31 -05:00 |