summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-29138-6224/+6942
|
* Fix phpdocRobin Appelman2013-01-281-2/+2
|
* Merge pull request #1313 from owncloud/updater-CSPLukas Reschke2013-01-283-27/+27
|\ | | | | Make update page with CSP compatible
| * Merge branch 'master' into updater-CSPThomas Mueller2013-01-28217-5235/+5896
| |\ | | | | | | | | | | | | Conflicts: core/templates/update.php
| * | Move update inline JSLukas Reschke2013-01-253-27/+26
| | |
| * | Move checkMaintenance and checkUpgradeLukas Reschke2013-01-251-2/+3
| | | | | | | | | | | | | | | This is needed to ensure that the routing and linkTo() function for CSP are available.
* | | Merge pull request #1318 from j-ed/masterThomas Müller2013-01-282-0/+6
|\ \ \ | |_|/ |/| | added parameter mail_smtpauthtype to set SMTP authentication type.
| * | Update lib/mail.phpj-ed2013-01-261-0/+2
| | | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type.
| * | Update config/config.sample.phpj-ed2013-01-261-0/+4
| | | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type.
* | | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-2811-46/+12
|\ \ \ | | | | | | | | Files: CSP fixes
| * | | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-266-27/+5
| | | |
| * | | Remove outdated commentsLukas Reschke2013-01-263-11/+0
| | | |
| * | | Fix undefined variableLukas Reschke2013-01-262-8/+7
| | | |
* | | | Merge pull request #1337 from owncloud/fix-issue-780Thomas Müller2013-01-271-0/+3
|\ \ \ \ | | | | | | | | | | Add create permission, fixes #780
| * | | | Add create permission, fixes #780Michael Gapczynski2013-01-271-0/+3
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2824-151/+187
| | | |
* | | | Merge pull request #1326 from owncloud/event-source-tokenLukas Reschke2013-01-262-2/+1
|\ \ \ \ | | | | | | | | | | Use global oc_requesttoken for Event Source
| * | | | Use global oc_requesttoken for Event SourceMichael Gapczynski2013-01-262-2/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-27165-4555/+5118
|/ / / /
* | | | 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*
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 07:54:09 +0000