Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make background transparent | Björn Schießle | 2013-01-30 | 1 | -0/+0 |
| | |||||
* | improved message if trash bin is empty | Björn Schießle | 2013-01-30 | 1 | -1/+1 |
| | |||||
* | added some additional error handling | Björn Schießle | 2013-01-29 | 1 | -11/+22 |
| | |||||
* | seperate css no longer needed, use files app css instead | Björn Schießle | 2013-01-29 | 2 | -79/+0 |
| | |||||
* | icons added; empty trash bin message added | Björn Schießle | 2013-01-29 | 6 | -8/+8 |
| | |||||
* | merge conflict fixed | Björn Schießle | 2013-01-28 | 1 | -43/+0 |
| | |||||
* | use hidden input field to disable sharing | Björn Schießle | 2013-01-28 | 1 | -0/+1 |
| | |||||
* | fix merge conflicts | Björn Schießle | 2013-01-28 | 446 | -8577/+30750 |
|\ | |||||
| * | Merge pull request #1318 from j-ed/master | Thomas Müller | 2013-01-28 | 2 | -0/+6 |
| |\ | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type. | ||||
| | * | Update lib/mail.php | j-ed | 2013-01-26 | 1 | -0/+2 |
| | | | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type. | ||||
| | * | Update config/config.sample.php | j-ed | 2013-01-26 | 1 | -0/+4 |
| | | | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type. | ||||
| * | | Merge pull request #1321 from owncloud/csp-fixes | Thomas Müller | 2013-01-28 | 11 | -46/+12 |
| |\ \ | | | | | | | | | Files: CSP fixes | ||||
| | * | | Use HTML5 data attribute + fix undefined variable | Lukas Reschke | 2013-01-26 | 6 | -27/+5 |
| | | | | |||||
| | * | | Remove outdated comments | Lukas Reschke | 2013-01-26 | 3 | -11/+0 |
| | | | | |||||
| | * | | Fix undefined variable | Lukas Reschke | 2013-01-26 | 2 | -8/+7 |
| | | | | |||||
| * | | | Merge pull request #1337 from owncloud/fix-issue-780 | Thomas Müller | 2013-01-27 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | Add create permission, fixes #780 | ||||
| | * | | | Add create permission, fixes #780 | Michael Gapczynski | 2013-01-27 | 1 | -0/+3 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-28 | 24 | -151/+187 |
| | | | | |||||
| * | | | Merge pull request #1326 from owncloud/event-source-token | Lukas Reschke | 2013-01-26 | 2 | -2/+1 |
| |\ \ \ | | | | | | | | | | | Use global oc_requesttoken for Event Source | ||||
| | * | | | Use global oc_requesttoken for Event Source | Michael Gapczynski | 2013-01-26 | 2 | -2/+1 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-27 | 165 | -4555/+5118 |
| |/ / / | |||||
| * | | | 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 |
| | | | | | | | | | | |