Commit Graph

9037 Commits

Author SHA1 Message Date
Lukas Reschke 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
Björn Schießle 19024de988 typo fixed 2013-01-25 17:44:40 +01:00
Björn Schießle a606e8d944 use display name to show share_width and owner information 2013-01-25 17:40:23 +01:00
Lukas Reschke d21946fdce Merge pull request #1258 from owncloud/no-inline-js
No inline JS - Work in progress
2013-01-25 08:20:26 -08:00
TheSFReader 2aead5727e Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-01-25 17:15:02 +01:00
TheSFReader 9f5847b739 Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments 2013-01-25 17:02:44 +01:00
Lukas Reschke d8c4e620af Use black background images 2013-01-25 16:23:03 +01:00
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Lukas Reschke 688fe0baa8 Merge pull request #1307 from owncloud/js_linkToRemote
Add js linkToRemote and linkToRemoteBase
2013-01-25 07:10:35 -08:00
Georg Ehrke bc9ab0726e add smart app banner to promote ios app 2013-01-25 16:05:16 +01:00
Thomas Tanghus 936e991394 Add js linkToRemote and linkToRemoteBase 2013-01-25 16:00:26 +01:00
Lukas Reschke 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
Lukas Reschke 0d2a58bc5d Initialize router also if ownCloud isn't installed 2013-01-25 14:57:52 +01:00
Lukas Reschke e5cc5a0a2d Allow the loading of external images 2013-01-25 14:26:14 +01:00
Björn Schießle e9a57e28fc show display name instead of uid 2013-01-25 13:57:08 +01:00
Björn Schießle 839f4bd949 show display name instead of uid in the public shared files view 2013-01-25 13:01:53 +01:00
Björn Schießle b4291f1e8e allow to get the display name from an abitrary user 2013-01-25 13:00:17 +01:00
Björn Schießle 64e853394c compare the correct uids 2013-01-25 12:46:32 +01:00
Björn Schießle 4271430e60 get all display names from users in a given group 2013-01-25 11:48:03 +01:00
Björn Schießle 9bb8e05839 get all display names 2013-01-25 11:05:00 +01:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Lukas Reschke 48e6ce7c56 Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master
drop SimpleTest compatibility
2013-01-24 08:06:39 -08:00
Thomas Mueller ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Björn Schießle 2fee1208ef add display name to title instead if login-ID 2013-01-24 15:49:23 +01:00
Björn Schießle d16574f070 new branch which introduces display names
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
Thomas Müller 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
Lukas Reschke 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
Tom Needham 8f9d3cd01d Code style update 2013-01-23 23:39:29 +00:00
Jenkins for ownCloud 3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Lukas Reschke 293e7bdcf0 Notice about changing the standard policy 2013-01-23 13:44:43 +01:00
Lukas Reschke 0517465f4d Allow admins to change the CSP policy in the config file 2013-01-23 13:42:52 +01:00
Thomas Mueller b4c3dd84b4 update to jquery-ui 1.10.0 2013-01-23 11:37:52 +01:00
Lukas Reschke 846971ec11 Fix merge conflict 2013-01-23 11:33:25 +01:00
Lukas Reschke fe56e4df7d Fix merge conflict 2013-01-23 11:32:14 +01:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Lukas Reschke 48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Thomas Mueller 5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Michael Gapczynski 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
Robin Appelman f858381775 merge master into filesystem 2013-01-22 23:27:04 +01:00
Thomas Müller 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
j-ed dcda792fbc Update config/config.sample.php
fixed an other typo.
2013-01-22 21:42:39 +01:00
j-ed 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
Robin Appelman 9a1f65aab1 Some style fixes 2013-01-22 20:58:09 +01:00
Robin Appelman 7330fcf5e8 Cache: make mounts overwrite existing folders, prevents duplicate entries 2013-01-22 20:57:15 +01:00
icewind1991 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
Sam Tuke c18aec56e2 Merge pull request #1105 from owncloud/files_encryption
Files encryption
2013-01-22 09:51:19 -08:00
Björn Schießle 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
Sam Tuke aa648fca75 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke ca454f0228 Removed depreciated file 2013-01-22 17:15:51 +00:00