mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,700 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

8700 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 01b3c088a9 fix color change on click 2013-01-28 19:47:51 +01:00
Jan-Christoph Borchardt a78ae6a5cb Merge branch 'master' into permanent-share-icons 2013-01-28 19:39:51 +01:00
Robin Appelman 06c1c35ac9 Fix phpdoc 2013-01-28 19:08:30 +01:00
Lukas Reschke 99ec26578a Merge pull request #1313 from owncloud/updater-CSP 
Make update page with CSP compatible
 2013-01-28 05:43:47 -08:00
Thomas Müller 857b15db37 Merge pull request #1318 from j-ed/master 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-28 01:42:46 -08:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP 
Conflicts:
	core/templates/update.php
 2013-01-28 09:57:24 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes 
Files: CSP fixes
 2013-01-28 00:29:46 -08:00
Thomas Müller 44d6ff61e2 Merge pull request #1337 from owncloud/fix-issue-780 
Add create permission, fixes #780
 2013-01-27 23:52:09 -08:00
Michael Gapczynski 10c428830e Add create permission, fixes #780 2013-01-27 23:31:31 -05:00
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Lukas Reschke 9e498b6548 Merge pull request #1326 from owncloud/event-source-token 
Use global oc_requesttoken for Event Source
 2013-01-26 15:18:23 -08:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Michael Gapczynski 0986b6f910 Use global oc_requesttoken for Event Source 2013-01-26 16:36:48 -05:00
Michael Gapczynski 31ebea0f6a Permanently display shared status icons 2013-01-26 13:25:15 -05:00
Lukas Reschke 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
Lukas Reschke 2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke 6c882d9806 Remove outdated comments 2013-01-26 14:03:17 +01:00
Lukas Reschke 7f0a3018b6 Fix undefined variable 2013-01-26 13:46:00 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 -08:00
Thomas Müller 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
Thomas Mueller 2cc77759aa lookup for OCA classes in all apps folders 2013-01-26 12:45:50 +01:00
j-ed 93834b78a1 Update lib/mail.php 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-26 12:09:54 +01:00
j-ed 4d74738fe7 Update config/config.sample.php 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-26 12:04:06 +01:00
Jenkins for ownCloud af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Lukas Reschke 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
Lukas Reschke dbc13cf6ee Move update inline JS 2013-01-25 19:18:16 +01:00
Lukas Reschke 7f49d35930 Move checkMaintenance and checkUpgrade 
This is needed to ensure that the routing and linkTo() function for CSP
are available.
 2013-01-25 19:15:02 +01:00
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
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
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
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
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