Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1320 from owncloud/implements-1316-master | Lukas Reschke | 2013-01-26 | 1 | -1/+8 |
|\ | | | | | lookup for OCA classes in all apps folders | ||||
| * | lookup for OCA classes in all apps folders | Thomas Mueller | 2013-01-26 | 1 | -1/+8 |
| | | |||||
* | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 15 | -161/+205 |
|\ \ | | | | | | | Fixing 998 master | ||||
| * | | replace #notification with OC.Notification call | Thomas Mueller | 2013-01-19 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-19 | 22 | -173/+141 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| * | | | update used space percent after each ajax call and display the notification | Thomas Mueller | 2013-01-19 | 2 | -4/+15 |
| | | | | |||||
| * | | | introducing class OCA/files/lib/Helper with new function to build an array ↵ | Thomas Mueller | 2013-01-19 | 4 | -76/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | with storage stats DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics() now returning used space percent on each ajax call | ||||
| * | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 763 | -8788/+8108 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js | ||||
| * | | | | relative storage info without decimals | Thomas Mueller | 2013-01-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | rename space -> storage | Thomas Mueller | 2013-01-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | pin notification to the top | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixing text-align on navigation menu - closing div was missing - THX Lukas | Thomas Mueller | 2013-01-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixing indent - sorryy wrong setting on the IDE :-( | Thomas Mueller | 2013-01-11 | 1 | -17/+15 |
| | | | | | | | | | | | | | | | | | | | | replace missing calls to OC.Notification.show | ||||
| * | | | | adding accidentally removed line - THX @bartv2 | Thomas Mueller | 2013-01-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 5 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The notification div has been moved to the user templates. Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline. | ||||
| * | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 275 | -5553/+8278 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| * | | | | | bring back L250 as spotted by @tanghus - THX | Thomas Mueller | 2013-01-08 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 3 | -6/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| * \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 27 | -558/+1043 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/helper.php | ||||
| * | | | | | | | js optimisations and style fixes | Thomas Mueller | 2013-01-06 | 1 | -15/+16 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 168 | -3312/+6177 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | javascript syntax error fixed on the way | Thomas Mueller | 2013-01-04 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | new javascript notification functions used within users.js | Thomas Mueller | 2013-01-04 | 1 | -5/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | javascript notification functions have been moved to js.js for common use | Thomas Mueller | 2013-01-04 | 3 | -43/+52 |
| | | | | | | | | | |||||
| * | | | | | | | | notifications are now shown/hidden using the js functions hideNotification ↵ | Thomas Mueller | 2013-01-02 | 2 | -38/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and showNotification. storage warnings are displayed in a notification. as soon as a notification is hidden the storage warning will come back. | ||||
| * | | | | | | | | make usedSpacePercent available in the files app | Thomas Mueller | 2013-01-02 | 2 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo() | Thomas Mueller | 2013-01-02 | 2 | -12/+23 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1306 from owncloud/smart-app-banner | Thomas Müller | 2013-01-26 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | add smart app banner to promote ios app | ||||
| * | | | | | | | | add smart app banner to promote ios app | Georg Ehrke | 2013-01-25 | 2 | -0/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-26 | 28 | -402/+442 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove the CSP header for Firefox | Lukas Reschke | 2013-01-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf* | ||||
* | | | | | | | | | Warn users not to enable DEBUG in productive environments | Lukas Reschke | 2013-01-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | Merge pull request #1258 from owncloud/no-inline-js | Lukas Reschke | 2013-01-25 | 44 | -1344/+16285 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | No inline JS - Work in progress | ||||
| * | | | | | | | | | Use black background images | Lukas Reschke | 2013-01-25 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-25 | 81 | -488/+645 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1307 from owncloud/js_linkToRemote | Lukas Reschke | 2013-01-25 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Add js linkToRemote and linkToRemoteBase | ||||
| * | | | | | | | | | Add js linkToRemote and linkToRemoteBase | Thomas Tanghus | 2013-01-25 | 1 | -0/+21 |
|/ / / / / / / / / | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-25 | 32 | -113/+175 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master | Lukas Reschke | 2013-01-24 | 23 | -215/+196 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | drop SimpleTest compatibility | ||||
| * | | | | | | | | | drop SimpleTest compatibility | Thomas Mueller | 2013-01-24 | 23 | -215/+196 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #1286 from owncloud/ocs_api | Thomas Müller | 2013-01-24 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Check that external api methods return instances of OC_OCS_Result | ||||
| * | | | | | | | | | Code style update | Tom Needham | 2013-01-23 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Check that api methods return the correct result type | Tom Needham | 2013-01-16 | 1 | -0/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1265 from j-ed/master | Lukas Reschke | 2013-01-24 | 2 | -2/+18 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | add additional mail_smtp.. parameters to fix possible SMTP connection problems. | ||||
| * | | | | | | | | | | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed an other typo. | ||||
| * | | | | | | | | | | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed type in line 70. Thank you for pointing me to that typo. | ||||
| * | | | | | | | | | | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added three additional mail_smtp.. parameters. - mail_smtpdebug - enable debug messages to analyse SMTP problems. - mail_smtptimeout - set SMTP timeout which is set to 10s by default and this is sometimes to short especially if a malware/ spam scanner is used. - mail_smtpsecure - force secure SMTP connections. | ||||
| * | | | | | | | | | | Update lib/mail.php | j-ed | 2013-01-22 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added three additional mail_smtp.. parameters. - mail_smtpdebug - enable debug messages to analyse SMTP problems. - mail_smtptimeout - set SMTP timeout which is set to 10s by default and this is sometimes to short especially if a malware/ spam scanner is used. - mail_smtpsecure - force secure SMTP connections. | ||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-24 | 34 | -170/+244 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | This breaks the installation | Lukas Reschke | 2013-01-25 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @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' |