| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 5 | -77/+25 |
| |\ | |||||
| | * | Merge pull request #4672 from owncloud/ocs_cleanup | blizzz | 2013-09-02 | 1 | -49/+0 |
| | |\ | |||||
| | | * | remove knowledgebase calls that are no longer used in ownCloud 5/6 | Frank Karlitschek | 2013-08-31 | 1 | -49/+0 |
| | * | | Merge pull request #4673 from owncloud/ocsapi_cleanup | Jörn Friedrich Dreyer | 2013-09-02 | 1 | -28/+0 |
| | |\ \ | |||||
| | | * | | remove the activity call here. it is not implemented anyways. This will be pr... | Frank Karlitschek | 2013-08-31 | 1 | -28/+0 |
| | | |/ | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 3 | -0/+25 |
| * | | | Fix some of @jancborchardt's complaints in oc_avatars | kondou | 2013-09-02 | 1 | -1/+1 |
| * | | | Properly check for tmpavatar, invalidate cache, fix debug msgs | kondou | 2013-09-01 | 1 | -1/+2 |
| * | | | Provide 'enable_avatars' in config.php, to disable avatars | kondou | 2013-09-01 | 1 | -5/+7 |
| * | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-01 | 2 | -137/+166 |
| |\| | | |||||
| | * | | Merge pull request #4329 from owncloud/fix_4258 | Christopher | 2013-09-01 | 1 | -136/+165 |
| | |\ \ | |||||
| | | * | | Check for $this->fileInfo and @depend on testData() | kondou | 2013-09-01 | 1 | -2/+2 |
| | | * | | Merge branch 'master' into fix_4258 | kondou | 2013-08-31 | 19 | -2/+1392 |
| | | |\| | |||||
| | | * | | Fix #4258, clean up \OC_Image and improve its unittest | kondou | 2013-08-30 | 1 | -136/+165 |
| | * | | | fixing this obvious typo directly | Frank Karlitschek | 2013-09-01 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-31 | 30 | -19/+1581 |
| |\| | | |||||
| | * | | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 13 | -17/+189 |
| | |\| | |||||
| | | * | Merge pull request #4661 from owncloud/separate-app-styles | Jan-Christoph Borchardt | 2013-08-30 | 1 | -1/+3 |
| | | |\ | |||||
| | | | * | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 1 | -0/+1 |
| | | | * | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 1 | -1/+2 |
| | | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 9 | -3/+168 |
| | | * | | Merge pull request #4578 from houbaastef/master | Stephane Martin | 2013-08-30 | 1 | -5/+10 |
| | | |\ \ | |||||
| | | | * | | fixes #4574 | Stephane Martin | 2013-08-26 | 1 | -5/+10 |
| | | * | | | Use the real username in preferences and magic cookie instead of case-insensi... | Arthur Schiwon | 2013-08-30 | 1 | -3/+4 |
| | | | |/ | | |/| | |||||
| | | * | | Merge pull request #4592 from owncloud/fix-logic | Thomas Müller | 2013-08-29 | 1 | -4/+2 |
| | | |\ \ | |||||
| | | | * | | fix weird logical behaviour | Morris Jobke | 2013-08-27 | 1 | -4/+2 |
| | | * | | | also emmit create hook when creating new files using touch() | Robin Appelman | 2013-08-29 | 1 | -0/+1 |
| | | * | | | webdav quota information contains the values for used and free - not total | Thomas Müller | 2013-08-29 | 1 | -1/+1 |
| | * | | | | fix parameter missing warning | Georg Ehrke | 2013-08-29 | 1 | -1/+1 |
| | * | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 22 | -112/+368 |
| | |\| | | | |||||
| | * | | | | invert logic of disable_previews | Georg Ehrke | 2013-08-29 | 1 | -3/+3 |
| | * | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 5 | -55/+39 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | fix return value of method | Georg Ehrke | 2013-08-23 | 1 | -1/+2 |
| | * | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 66 | -242/+376 |
| | |\ \ \ \ | |||||
| | * | | | | | make it possible to disable previews | Georg Ehrke | 2013-08-23 | 1 | -0/+10 |
| | * | | | | | style fixes for preview lib | Georg Ehrke | 2013-08-19 | 5 | -43/+46 |
| | * | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 97 | -600/+853 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | check if ->resource is a resource | Georg Ehrke | 2013-08-15 | 1 | -2/+4 |
| | * | | | | | | add comment to make @jancborchardt happy | Georg Ehrke | 2013-08-15 | 1 | -0/+1 |
| | * | | | | | | fix svg and cache transparency issue | Georg Ehrke | 2013-08-15 | 3 | -3/+10 |
| | * | | | | | | improve unknown backend | Georg Ehrke | 2013-08-15 | 2 | -20/+35 |
| | * | | | | | | don't generate previews of empty txt files | Georg Ehrke | 2013-08-14 | 1 | -0/+4 |
| | * | | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 89 | -571/+1078 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | fix deleting old previews after file changed | Georg Ehrke | 2013-08-14 | 1 | -1/+1 |
| | * | | | | | | | remove \OC\Preview::showErrorPreview | Georg Ehrke | 2013-08-14 | 1 | -7/+0 |
| | * | | | | | | | update indexes of oc_permissions | Georg Ehrke | 2013-08-09 | 1 | -1/+1 |
| | * | | | | | | | allow permissions.user to be null as suggested by @butonic | Georg Ehrke | 2013-08-07 | 1 | -1/+1 |
| | * | | | | | | | fix merge conflicts | Georg Ehrke | 2013-08-05 | 15 | -118/+239 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | suppress is_file error msg | Georg Ehrke | 2013-08-05 | 1 | -1/+1 |
| | * | | | | | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-07-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |