summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1320 from owncloud/implements-1316-masterLukas Reschke2013-01-261-1/+8
|\ | | | | lookup for OCA classes in all apps folders
| * lookup for OCA classes in all apps foldersThomas Mueller2013-01-261-1/+8
| |
* | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-2615-161/+205
|\ \ | | | | | | Fixing 998 master
| * | replace #notification with OC.Notification callThomas Mueller2013-01-191-2/+1
| | |
| * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1922-173/+141
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * | | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-192-4/+15
| | | |
| * | | introducing class OCA/files/lib/Helper with new function to build an array ↵Thomas Mueller2013-01-194-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-masterThomas Mueller2013-01-18763-8788/+8108
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js
| * | | | relative storage info without decimalsThomas Mueller2013-01-171-1/+1
| | | | |
| * | | | rename space -> storageThomas Mueller2013-01-171-1/+1
| | | | |
| * | | | pin notification to the topThomas Mueller2013-01-111-1/+1
| | | | |
| * | | | fixing text-align on navigation menu - closing div was missing - THX LukasThomas Mueller2013-01-111-1/+1
| | | | |
| * | | | fixing indent - sorryy wrong setting on the IDE :-(Thomas Mueller2013-01-111-17/+15
| | | | | | | | | | | | | | | | | | | | replace missing calls to OC.Notification.show
| * | | | adding accidentally removed line - THX @bartv2Thomas Mueller2013-01-111-0/+1
| | | | |
| * | | | displaying notification now centeredThomas Mueller2013-01-115-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-masterThomas Mueller2013-01-11275-5553/+8278
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * | | | | bring back L250 as spotted by @tanghus - THXThomas Mueller2013-01-081-0/+1
| | | | | |
| * | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-063-6/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js
| * \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0627-558/+1043
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/helper.php
| * | | | | | | js optimisations and style fixesThomas Mueller2013-01-061-15/+16
| | | | | | | |
| * | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-06168-3312/+6177
| |\ \ \ \ \ \ \
| * | | | | | | | javascript syntax error fixed on the wayThomas Mueller2013-01-041-3/+3
| | | | | | | | |
| * | | | | | | | new javascript notification functions used within users.jsThomas Mueller2013-01-041-5/+4
| | | | | | | | |
| * | | | | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-043-43/+52
| | | | | | | | |
| * | | | | | | | notifications are now shown/hidden using the js functions hideNotification ↵Thomas Mueller2013-01-022-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 appThomas Mueller2013-01-022-0/+5
| | | | | | | | |
| * | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-022-12/+23
| | | | | | | | |
* | | | | | | | | Merge pull request #1306 from owncloud/smart-app-bannerThomas Müller2013-01-262-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | add smart app banner to promote ios app
| * | | | | | | | add smart app banner to promote ios appGeorg Ehrke2013-01-252-0/+2
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2628-402/+442
| | | | | | | | |
* | | | | | | | | Remove the CSP header for FirefoxLukas Reschke2013-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
* | | | | | | | | Warn users not to enable DEBUG in productive environmentsLukas Reschke2013-01-251-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-jsLukas Reschke2013-01-2544-1344/+16285
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | No inline JS - Work in progress
| * | | | | | | | | Use black background imagesLukas Reschke2013-01-251-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-2581-488/+645
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1307 from owncloud/js_linkToRemoteLukas Reschke2013-01-251-0/+21
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Add js linkToRemote and linkToRemoteBase
| * | | | | | | | | Add js linkToRemote and linkToRemoteBaseThomas Tanghus2013-01-251-0/+21
|/ / / / / / / / /
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2532-113/+175
| | | | | | | | |
* | | | | | | | | Merge pull request #1291 from owncloud/drop-simpletest-compatibility-masterLukas Reschke2013-01-2423-215/+196
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | drop SimpleTest compatibility
| * | | | | | | | | drop SimpleTest compatibilityThomas Mueller2013-01-2423-215/+196
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1286 from owncloud/ocs_apiThomas Müller2013-01-241-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Check that external api methods return instances of OC_OCS_Result
| * | | | | | | | | Code style updateTom Needham2013-01-231-1/+1
| | | | | | | | | |
| * | | | | | | | | Check that api methods return the correct result typeTom Needham2013-01-161-0/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-242-2/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | add additional mail_smtp.. parameters to fix possible SMTP connection problems.
| * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed an other typo.
| * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed type in line 70. Thank you for pointing me to that typo.
| * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-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.phpj-ed2013-01-221-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 transifexJenkins for ownCloud2013-01-2434-170/+244
| | | | | | | | | | |
| | | * | | | | | | | This breaks the installationLukas Reschke2013-01-251-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'