Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Georg Ehrke | 2013-08-05 | 1 | -2/+23 |
|\ | |||||
| * | cancel sharing if some users doesn't have a working encryption set-up. | Bjoern Schiessle | 2013-08-01 | 1 | -2/+20 |
| * | fixes #4026 | Thomas Müller | 2013-07-30 | 1 | -0/+3 |
* | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 6 | -17/+71 |
|\| | |||||
| * | functions in OCP should be static | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
| * | need to use \OC_Image to escape OCP namespace | Jörn Friedrich Dreyer | 2013-07-22 | 1 | -1/+1 |
| * | return result from getL10N | Robin Appelman | 2013-07-22 | 1 | -1/+1 |
| * | Merge pull request #3880 from owncloud/code-checker | Bart Visscher | 2013-07-21 | 3 | -8/+46 |
| |\ | |||||
| | * | Correct casing of OC_User and pass through the params to getUsers | Bart Visscher | 2013-07-19 | 1 | -8/+8 |
| | * | Add OC_L10N to public api | Bart Visscher | 2013-07-19 | 1 | -0/+9 |
| | * | Add OC_Image to public api | Bart Visscher | 2013-07-19 | 1 | -0/+29 |
| * | | add proper deprecated tag | Morris Jobke | 2013-07-21 | 1 | -0/+1 |
| * | | add back public API function, but mark as deprecated | Jan-Christoph Borchardt | 2013-07-20 | 1 | -0/+10 |
| * | | finally remove the file size obfuscation as it had more disadvantages. I was ... | Jan-Christoph Borchardt | 2013-07-18 | 1 | -10/+0 |
| * | | Merge pull request #3270 from owncloud/convert-oc_config | icewind1991 | 2013-07-11 | 1 | -6/+21 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into convert-oc_config | Bart Visscher | 2013-07-08 | 1 | -1/+24 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into convert-oc_config | Bart Visscher | 2013-07-04 | 1 | -0/+108 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into convert-oc_config | Thomas Müller | 2013-07-01 | 1 | -2/+32 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into convert-oc_config | Bart Visscher | 2013-06-27 | 1 | -12/+12 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into convert-oc_config | Michael Gapczynski | 2013-06-03 | 2 | -61/+266 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix returns of values in OCP\Config | Bart Visscher | 2013-05-07 | 1 | -6/+21 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | add class='preview-icon' to rows in file app that make use of previews | Georg Ehrke | 2013-07-29 | 1 | -27/+11 |
* | | | | | | | | implement use of previews in sharing app | Georg Ehrke | 2013-07-11 | 1 | -0/+10 |
* | | | | | | | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 3 | -3/+189 |
|\| | | | | | | | |||||
| * | | | | | | | Implement encodePath | Victor Dubiniuk | 2013-07-09 | 1 | -0/+14 |
| * | | | | | | | Only emit permissions hook for files and and include path | Michael Gapczynski | 2013-07-08 | 1 | -9/+11 |
| * | | | | | | | Add update permissions hook to sharing | Michael Gapczynski | 2013-07-08 | 1 | -0/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | removing unused getSharedItem() | Thomas Müller | 2013-07-06 | 1 | -11/+0 |
| * | | | | | | Merge branch 'master' into fixing-3942-master | Thomas Müller | 2013-07-06 | 1 | -1/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | proper fix for getting the shared item if no user is logged in | Thomas Müller | 2013-07-05 | 1 | -1/+12 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * / | | | | | on reshares we now recursively move to the root of all reshares - therefore s... | Thomas Müller | 2013-07-05 | 1 | -0/+23 |
| |/ / / / / | |||||
| * | | | / | add public api | Björn Schießle | 2013-07-04 | 1 | -0/+108 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #3832 from owncloud/oracle_sql_fixes | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -1/+7 |
| |\ \ \ \ | |||||
| | * | | | | Oracle doesn't know & as bitwise AND | Bart Visscher | 2013-06-28 | 1 | -6/+8 |
| | * | | | | for oracle use BITAND() instead of & in sharing permissions sql | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -3/+7 |
| | | |_|/ | | |/| | | |||||
| * | | | | fix type of numeric columns | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -0/+24 |
| * | | | | check item id is set | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | implement server side use of previews | Georg Ehrke | 2013-06-26 | 1 | -0/+9 |
* | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-17 | 1 | -12/+12 |
|\| | | | |||||
| * | | | add missing backticks, use executeAudited in post_deleteGroup and post_remove... | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -6/+6 |
| * | | | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -6/+6 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-06 | 2 | -95/+160 |
|\| | | |||||
| * | | Merge pull request #3444 from owncloud/share-fix | Jörn Friedrich Dreyer | 2013-06-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix undefined index for share mount point retrieval | Michael Gapczynski | 2013-05-21 | 1 | -1/+1 |
| | |/ | |||||
| * | | merge master into backgroundjob | Robin Appelman | 2013-06-02 | 1 | -2/+159 |
| |\ \ | |||||
| | * | | fixes for pgsql | Florin Peter | 2013-05-29 | 1 | -4/+4 |
| | * | | changed deprecated class | Florin Peter | 2013-05-29 | 1 | -1/+1 |
| | * | | fixes if cache returns false | Florin Peter | 2013-05-29 | 1 | -6/+16 |
| | * | | fix $parent/$source typo | Florin Peter | 2013-05-29 | 1 | -2/+1 |
| | * | | fix indention | Björn Schießle | 2013-05-29 | 1 | -5/+5 |