03b947e3ec
Don't check for updates for sub storages, these scans should be done in the background
2013-01-26 16:11:35 -05:00
f25db779d9
Filesystem: move mount management to it's own class
2013-01-26 21:44:33 +01:00
177537dbcc
Cache: port test cases to PHPUnit
2013-01-26 21:44:33 +01:00
7237ebf08b
Fix OC_Helper and change deprecated methods
2013-01-26 15:16:53 -05:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
c9e25d3fab
Merge pull request #1320 from owncloud/implements-1316-master
...
lookup for OCA classes in all apps folders
2013-01-26 05:20:15 -08:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
3b547895ec
Merge pull request #1306 from owncloud/smart-app-banner
...
add smart app banner to promote ios app
2013-01-26 04:00:57 -08:00
2cc77759aa
lookup for OCA classes in all apps folders
2013-01-26 12:45:50 +01:00
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
a65410f23c
Remove the CSP header for Firefox
...
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
2013-01-25 21:57:51 +01:00
0d6a577481
Warn users not to enable DEBUG in productive environments
...
The debug mode should not be enabled in productive environments and is also a security risk since some apps outputs unsanitized debug data to the template.
2013-01-25 18:14:37 +01:00
d21946fdce
Merge pull request #1258 from owncloud/no-inline-js
...
No inline JS - Work in progress
2013-01-25 08:20:26 -08:00
d8c4e620af
Use black background images
2013-01-25 16:23:03 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
688fe0baa8
Merge pull request #1307 from owncloud/js_linkToRemote
...
Add js linkToRemote and linkToRemoteBase
2013-01-25 07:10:35 -08:00
bc9ab0726e
add smart app banner to promote ios app
2013-01-25 16:05:16 +01:00
936e991394
Add js linkToRemote and linkToRemoteBase
2013-01-25 16:00:26 +01:00
ff4d62132a
This breaks the installation
...
@bartv2 This JS part is breaking the installation (POST parameters are
not transferred), could you please take a look? THX.
JS console says:
uncaught exception: cannot call methods on button prior to
initialization; attempted to call method 'disable'
2013-01-25 15:47:57 +01:00
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
48e6ce7c56
Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master
...
drop SimpleTest compatibility
2013-01-24 08:06:39 -08:00
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
1dac2ba496
Merge pull request #1286 from owncloud/ocs_api
...
Check that external api methods return instances of OC_OCS_Result
2013-01-24 02:37:40 -08:00
f9a9fc5670
Merge pull request #1265 from j-ed/master
...
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
8f9d3cd01d
Code style update
2013-01-23 23:39:29 +00:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
293e7bdcf0
Notice about changing the standard policy
2013-01-23 13:44:43 +01:00
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
846971ec11
Fix merge conflict
2013-01-23 11:33:25 +01:00
fe56e4df7d
Fix merge conflict
2013-01-23 11:32:14 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
5fadd53088
missing renames of publicListView to disableSharing
2013-01-23 09:18:26 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
ec8609fa21
Merge pull request #1259 from TheSFReader/master
...
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
dcda792fbc
Update config/config.sample.php
...
fixed an other typo.
2013-01-22 21:42:39 +01:00
dfa5f2de4d
Update config/config.sample.php
...
Fixed type in line 70. Thank you for pointing me to that typo.
2013-01-22 21:33:01 +01:00
9a1f65aab1
Some style fixes
2013-01-22 20:58:09 +01:00
7330fcf5e8
Cache: make mounts overwrite existing folders, prevents duplicate entries
2013-01-22 20:57:15 +01:00
12e286b21c
Merge pull request #1237 from owncloud/fix-template-tests
...
Remove unnecessary ob_end_clean() from template tests
2013-01-22 11:12:40 -08:00
c18aec56e2
Merge pull request #1105 from owncloud/files_encryption
...
Files encryption
2013-01-22 09:51:19 -08:00
367aadb3b7
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
2013-01-22 18:34:59 +01:00
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
ca454f0228
Removed depreciated file
2013-01-22 17:15:51 +00:00
47592657d7
Added localisation for encryption settings
2013-01-22 17:15:03 +00:00
Michael Gapczynski
Robin Appelman
Lukas Reschke
Thomas Müller
Georg Ehrke
Thomas Tanghus
Tom Needham
j-ed
icewind1991
Sam Tuke
Björn Schießle
Sam Tuke