summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Fix hasUpdated for folders in swift backendRobin Appelman2014-09-051-0/+22
| * | | | | | | | | | Fix configuration of rackspaceRobin Appelman2014-09-052-20/+30
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_linksLukas Reschke2014-09-0810-17/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Match \OC_Helper::linkToPublic() to new links and fit unittestskondou2014-09-042-10/+28
| * | | | | | | | | | Readd TOKEN_LENGTHkondou2014-09-042-1/+3
| * | | | | | | | | | Use base62 and remove configuration options for link lengthkondou2014-09-042-21/+2
| * | | | | | | | | | Change config.sample entry and use MediumSecuritykondou2014-09-042-8/+10
| * | | | | | | | | | Adapt token size to new generation and add an option for free length specific...kondou2014-09-041-16/+5
| * | | | | | | | | | Use a route instead of s.php and convert tokens asapkondou2014-09-0412-54/+69
| * | | | | | | | | | Initial work on shorter linkskondou2014-09-045-3/+53
* | | | | | | | | | | Merge pull request #10930 from owncloud/use-admincheckLukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check for admin user instead of subadminLukas Reschke2014-09-081-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #10451 from k4k/login_logo_alignment_fixVolkan Gezer2014-09-082-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | improve logo flexibility to fix wide custom logo alignment, fix #9339twood82014-08-152-3/+1
* | | | | | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetypeLukas Reschke2014-09-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use secure mimetype for content deliveryLukas Reschke2014-09-082-2/+2
* | | | | | | | | | | | | Merge pull request #10827 from oparoz/patch-2Lukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | env:UserInstallation was already there in masterOlivier Paroz2014-09-031-2/+2
| * | | | | | | | | | | | | Libreoffice config folder needs to be setOlivier Paroz2014-09-031-1/+1
* | | | | | | | | | | | | | Merge pull request #10890 from owncloud/fix-10888Lukas Reschke2014-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | if only one attribute is requested, the returned array has 0 as key instead o...Arthur Schiwon2014-09-051-1/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #10911 from owncloud/template-funcsLukas Reschke2014-09-081-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add shortcut functions for style and scriptBernhard Posselt2014-09-061-0/+18
* | | | | | | | | | | | | | | Merge pull request #10935 from owncloud/who_knows_what_horrors_lie_in_the_dar...Clark Tomlinson2014-09-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | w͢͢͝h͡o͢͡ ̸͢k̵͟n̴͘ǫw̸̛s͘ ̀́w͘͢ḩ̵a҉̡͢t ̧̕h́o̵r͏...Jörn Friedrich Dreyer2014-09-081-0/+2
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #10891 from owncloud/files-moveoperationcatchexceptionVincent Petry2014-09-081-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Catch exceptions when moving filesVincent Petry2014-09-051-4/+10
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10862 from chli1/masterVincent Petry2014-09-081-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix BadRequest error if CONTENT_LENGTH not setchli12014-09-041-5/+8
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0719-16/+54
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0617-43/+47
* | | | | | | | | | | | Merge pull request #10889 from owncloud/moveTrustedDomainCheckLukas Reschke2014-09-051-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move trusted domain check to init()Lukas Reschke2014-09-051-15/+15
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #10145 from owncloud/cache-updater-refactorVincent Petry2014-09-058-466/+526
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove explicit propagate callsRobin Appelman2014-09-052-19/+7
| * | | | | | | | | | | | remove unstable testRobin Appelman2014-09-051-1/+0
| * | | | | | | | | | | | Update cache before post hooksRobin Appelman2014-09-051-19/+20
| * | | | | | | | | | | | Fix warning in homecacheRobin Appelman2014-09-051-0/+3
| * | | | | | | | | | | | Fix unit testRobin Appelman2014-09-053-9/+6
| * | | | | | | | | | | | Improve unit tests for Cache\UpdaterRobin Appelman2014-09-052-281/+416
| * | | | | | | | | | | | Refactor Cache\Updater to work outside of the users homeRobin Appelman2014-09-054-174/+111
* | | | | | | | | | | | | Merge pull request #10860 from owncloud/scrolltofixClark Tomlinson2014-09-054-28/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | add / to url to match routeJörn Friedrich Dreyer2014-09-041-1/+1
| * | | | | | | | | | | | Scroll to new file/folder after addingVincent Petry2014-09-042-5/+10
| * | | | | | | | | | | | Fixed scrollto for search resultsVincent Petry2014-09-042-22/+36
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #10870 from owncloud/dnd-droponreadonlyfolderfixVincent Petry2014-09-053-2/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added permission check for drag and dropVincent Petry2014-09-043-2/+35
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #10871 from owncloud/issue_10674Jesus Macias Portela2014-09-051-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix 3rdparty pointerJesus Macias2014-09-041-0/+0
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0518-35/+64
|/ / / / / / / / / / /