summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20994 from owncloud/personal-pageThomas Müller2016-01-065-102/+149
|\
| * fix overlap and functionality of cropperJan-Christoph Borchardt2015-12-283-3/+19
| * improve layout of personal settings pageJan-Christoph Borchardt2015-12-285-103/+134
* | Merge pull request #21349 from owncloud/web_use_shareeThomas Müller2016-01-062-19/+406
|\ \
| * | Added js tests for the Sharee API usageRoeland Jago Douma2015-12-301-0/+292
| * | Fix unit testsRoeland Jago Douma2015-12-302-7/+33
| * | Filter out share owner in sharee suggestion listRoeland Jago Douma2015-12-301-0/+9
| * | Web sharing uses sharee endpointRoeland Jago Douma2015-12-301-15/+75
* | | Merge pull request #21398 from owncloud/sharing-disabled-cacheThomas Müller2016-01-061-2/+3
|\ \ \
| * | | Cache sharing disabled in the viewRobin Appelman2015-12-301-2/+3
| | |/ | |/|
* | | Merge pull request #21443 from owncloud/fix-container-lookupThomas Müller2016-01-061-1/+1
|\ \ \
| * | | Lookup the App name instead of OCAJoas Schilling2016-01-041-1/+1
* | | | Merge pull request #21444 from owncloud/move-regenerate-belowThomas Müller2016-01-068-8/+72
|\ \ \ \
| * | | | Assign DB group for unit testsLukas Reschke2016-01-041-0/+4
| * | | | Move regeneration of session ID into session classesLukas Reschke2016-01-048-8/+68
| |/ / /
* | | | Merge pull request #21459 from owncloud/make-ldap-more-robustThomas Müller2016-01-062-1/+2
|\ \ \ \
| * | | | Make LDAP more robust to exceptions and log them properlyMorris Jobke2016-01-062-1/+2
* | | | | Merge pull request #21469 from owncloud/drop-old-gallery-tableThomas Müller2016-01-061-0/+1
|\ \ \ \ \
| * | | | | Drop oc_gallery_sharing which was removed in 8.0.0Morris Jobke2016-01-061-0/+1
| |/ / / /
* | | | | Merge pull request #21482 from owncloud/htaccess-ico-ruleThomas Müller2016-01-061-1/+1
|\ \ \ \ \
| * | | | | Allow ico files to be served staticallyMorris Jobke2016-01-061-1/+1
| |/ / / /
* | | | | Merge pull request #21488 from th3fallen/patch-1Thomas Müller2016-01-061-4/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Blacklist myselfClark Tomlinson2016-01-061-4/+12
|/ / / /
* | | | Merge pull request #21473 from owncloud/fix-unit-tests-because-appstoreJörn Friedrich Dreyer2016-01-065-32/+38
|\ \ \ \
| * | | | Inject OCSClientLukas Reschke2016-01-065-32/+38
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0620-30/+56
* | | | Merge pull request #21409 from JohannesKleine/patch-1Jörn Friedrich Dreyer2016-01-051-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into patch-1JohannesKleine2016-01-024-0/+6
| |\ \ \ \
| * | | | | Update config.sample.phpJohannesKleine2015-12-311-1/+1
* | | | | | Merge pull request #21377 from owncloud/login-submit-button-border-2Jörn Friedrich Dreyer2016-01-051-0/+2
|\ \ \ \ \ \
| * | | | | | Remove unnecessary border from login buttonChristoph Wurst2015-12-291-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #21446 from edwardcrompton/feature/21413-better-occ-user-helpJörn Friedrich Dreyer2016-01-051-0/+1
|\ \ \ \ \ \
| * | | | | | Whitespace correctionEdward Crompton2016-01-041-1/+1
| * | | | | | Removing the . from the end of the help response to match convention set by o...Edward Crompton2016-01-041-1/+1
| * | | | | | Adding a more helpful error message for when occ is run at the console as the...Edward Crompton2016-01-041-1/+2
* | | | | | | Merge pull request #21454 from owncloud/proper-style-sidebar-transparencyJörn Friedrich Dreyer2016-01-051-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Use color instead of transparency for proper tooltip appearanceMorris Jobke2016-01-051-0/+3
* | | | | | | | Merge pull request #21442 from owncloud/annotate-typeJörn Friedrich Dreyer2016-01-051-6/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Annotate typeLukas Reschke2016-01-041-6/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0572-116/+216
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #21393 from owncloud/fix-urlgenerator-callThomas Müller2016-01-041-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | No more deprecation messages in error logThomas Müller2015-12-291-1/+5
* | | | | | Merge pull request #21435 from owncloud/improved_upgrade_messagesBjörn Schießle2016-01-042-4/+4
|\ \ \ \ \ \
| * | | | | | don't show previous log level in upgrade messageBjörn Schießle2016-01-042-4/+4
|/ / / / / /
* | | | / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-0416-2/+100
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-022-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-012-0/+4
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-3130-4/+160
* | | | Merge pull request #21402 from owncloud/view-getuserobject-cacheThomas Müller2015-12-301-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Cache usermanager instance in viewRobin Appelman2015-12-301-1/+4
| | |/ | |/|