| Commit message (Expand) | Author | Age | Files | Lines |
* | add blacklist to txt preview backend | Georg Ehrke | 2013-09-24 | 1 | -0/+10 |
* | Merge pull request #4327 from owncloud/scanfile-remove | Thomas Müller | 2013-09-22 | 1 | -0/+2 |
|\ |
|
| * | remove deleted files while scanning | Robin Appelman | 2013-08-06 | 1 | -0/+2 |
* | | Merge pull request #4623 from owncloud/convert-oc_preferences | Bart Visscher | 2013-09-22 | 4 | -73/+282 |
|\ \ |
|
| * | | update inherit docs comment | Bart Visscher | 2013-09-19 | 1 | -3/+3 |
| * | | Fix insert/update/delete helper functions for oracle | Bart Visscher | 2013-09-19 | 2 | -1/+55 |
| * | | Add missing return true statements to legacy preferences functions | Bart Visscher | 2013-09-19 | 1 | -0/+9 |
| * | | Add missing static | Bart Visscher | 2013-09-19 | 1 | -1/+1 |
| * | | Convert OC_Preference to object interface | Bart Visscher | 2013-09-19 | 2 | -72/+218 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-22 | 3 | -3/+10 |
* | | | files: when filtering search results, ensure results are children of the fake... | Robin Appelman | 2013-09-22 | 1 | -6/+8 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-20 | 5 | -3/+27 |
* | | | Merge pull request #4684 from owncloud/improved-console | Bart Visscher | 2013-09-19 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Use more object oriented way for console commands | Bart Visscher | 2013-09-01 | 1 | -0/+1 |
* | | | | Merge pull request #4263 from owncloud/search_scrollto | Jörn Friedrich Dreyer | 2013-09-19 | 2 | -2/+5 |
|\ \ \ \ |
|
| * | | | | initial scrollto implementation: | Jörn Friedrich Dreyer | 2013-09-17 | 2 | -2/+5 |
| | |/ /
| |/| | |
|
* / | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-18 | 14 | -4/+75 |
|/ / / |
|
* | | | Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle | Bart Visscher | 2013-09-16 | 1 | -1/+3 |
|\ \ \ |
|
| * | | | Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc. | Andreas Fischer | 2013-09-12 | 1 | -0/+1 |
| * | | | Create instance of Doctrine\Common\EventManager() in OC_DB. | Andreas Fischer | 2013-09-12 | 1 | -1/+2 |
* | | | | Add OCP\DB::getErrorMessage() to public namespace. | Thomas Tanghus | 2013-09-16 | 1 | -0/+11 |
* | | | | adding null check on a mount's storage | Thomas Müller | 2013-09-15 | 1 | -0/+6 |
* | | | | Merge pull request #4506 from owncloud/oc_avatars | Bernhard Posselt | 2013-09-14 | 5 | -0/+111 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 18 | -94/+181 |
| |\ \ \ \ |
|
| * | | | | | Bring another enable_avatars to $_ and fix $thus->$this | kondou | 2013-09-11 | 2 | -1/+2 |
| * | | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatars | kondou | 2013-09-09 | 1 | -19/+22 |
| * | | | | | Use \OC_App for checking whether encryption is enabled | kondou | 2013-09-05 | 1 | -1/+1 |
| * | | | | | Fix some bugs and remove \OCP\Avatar for now | kondou | 2013-09-04 | 1 | -12/+0 |
| * | | | | | fixing style, var name & PHPDoc | Thomas Müller | 2013-09-04 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-04 | 11 | -235/+311 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 5 | -77/+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 branch 'master' into oc_avatars | kondou | 2013-08-31 | 30 | -19/+1581 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| * | | | | | | | | Fix \OCP\Avatar | kondou | 2013-08-30 | 1 | -17/+1 |
| * | | | | | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests | kondou | 2013-08-30 | 2 | -5/+21 |
| * | | | | | | | | Use defaultavatars | kondou | 2013-08-29 | 2 | -2/+6 |
| * | | | | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 2 | -0/+51 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatars | kondou | 2013-08-28 | 1 | -13/+0 |
| * | | | | | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 23 | -120/+325 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Continue work on cropper | kondou | 2013-08-28 | 4 | -5/+19 |
| * | | | | | | | | | | Clean up some cruft | kondou | 2013-08-26 | 1 | -4/+1 |
| * | | | | | | | | | | Have a controller instead ofo avatar.php and fix some cropper-design | kondou | 2013-08-26 | 1 | -1/+1 |
| * | | | | | | | | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIP | kondou | 2013-08-25 | 3 | -8/+21 |
| * | | | | | | | | | | Fix spacing, have remove() and return JSON for custom-default-avatars | kondou | 2013-08-25 | 1 | -54/+40 |
| * | | | | | | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even... | kondou | 2013-08-25 | 1 | -84/+30 |
| * | | | | | | | | | | Clean up and prepare a bit for custom default avatars | kondou | 2013-08-25 | 1 | -7/+6 |
| * | | | | | | | | | | Several improvements | kondou | 2013-08-25 | 2 | -7/+12 |