| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 53 | -616/+2190 |
| |\ | |||||
| | * | remove unused OC_L10N | Thomas Müller | 2013-09-13 | 1 | -1/+0 |
| | * | adding TB and GB to OC_Helper::humanFileSize | Thomas Müller | 2013-09-13 | 1 | -2/+9 |
| | * | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 12 | -73/+103 |
| | |\ | |||||
| | | * | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 3 | -23/+30 |
| | | * | Always check variable type before using readdir to avoid surprises | Arthur Schiwon | 2013-09-04 | 9 | -50/+73 |
| | * | | adding icons for shared folders and external folders | Thomas Müller | 2013-09-12 | 1 | -0/+8 |
| | * | | Merge pull request #4798 from owncloud/fixing-variable-typos-master | VicDeo | 2013-09-11 | 1 | -3/+3 |
| | |\ \ | |||||
| | | * | | no further comment - which dev did not test this BEFORE submitting the pull r... | Thomas Müller | 2013-09-11 | 1 | -3/+3 |
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-11 | 1 | -4/+18 |
| | |/ / | |||||
| | * | | Merge pull request #4472 from owncloud/remove-disconnect | Andreas Fischer | 2013-09-10 | 1 | -12/+0 |
| | |\ \ | |||||
| | | * | | Remove disconnect function from OC_DB | Bart Visscher | 2013-08-16 | 1 | -12/+0 |
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 3 | -12/+12 |
| | * | | | Merge pull request #4757 from owncloud/deleteAll-alias | Thomas Müller | 2013-09-09 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | change View->deleteAll to an alias of View->rmdir since rmdir works recursive | Robin Appelman | 2013-09-07 | 1 | -1/+1 |
| | * | | | | Merge pull request #4772 from owncloud/preview_improvements | Thomas Müller | 2013-09-09 | 1 | -4/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | use avconv instead of ffmpeg | Georg Ehrke | 2013-09-05 | 1 | -4/+4 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-08 | 1 | -5/+5 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-07 | 5 | -1/+26 |
| | | |/ / / | |/| | | | |||||
| | * | | | | remove some more debug output | Bjoern Schiessle | 2013-09-06 | 1 | -2/+0 |
| | * | | | | remove some error_logs | Bjoern Schiessle | 2013-09-06 | 1 | -1/+0 |
| | * | | | | remove error logs | Bjoern Schiessle | 2013-09-06 | 1 | -2/+2 |
| | * | | | | if the files doesn't exist yet we start with the parent to search for shares | Bjoern Schiessle | 2013-09-06 | 1 | -4/+12 |
| | * | | | | Revert "fixes #4574" | Thomas Müller | 2013-09-06 | 1 | -10/+5 |
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-05 | 3 | -8/+43 |
| | |/ / / | |||||
| | * | | | Merge pull request #4477 from owncloud/hooks-view | Bernhard Posselt | 2013-09-04 | 1 | -32/+57 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | | * | | also emit hooks for views that are a subfolder of the user folder | Robin Appelman | 2013-08-17 | 1 | -32/+57 |
| | | |/ | |||||
| | * | | Merge pull request #4449 from owncloud/clean_up_util | Morris Jobke | 2013-09-03 | 10 | -231/+307 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 55 | -337/+2197 |
| | | |\ \ | |||||
| | | * | | | Fix some phpdoc and camelcase | kondou | 2013-08-23 | 1 | -15/+17 |
| | | * | | | fixing typos | Thomas Müller | 2013-08-22 | 1 | -9/+10 |
| | | * | | | Merge branch 'master' into clean_up_util | kondou | 2013-08-20 | 116 | -766/+1124 |
| | | |\ \ \ | |||||
| | | * | | | | Fix some naming and spacing in lib/util.php | kondou | 2013-08-18 | 2 | -12/+17 |
| | | * | | | | Clean up \OC\Util | kondou | 2013-08-15 | 10 | -211/+279 |
| | * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 1 | -4/+4 |
| | * | | | | | 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 |
| | * | | | | | 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 master into oc_preview | Georg Ehrke | 2013-08-30 | 13 | -17/+189 |
| | |\| | | | | |||||
| | * | | | | | 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 |
| | |\ \ \ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |