summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* pass view hooks trough to the node hooksRobin Appelman2015-09-281-1/+5
* Add hook connector to connect view and node hooksRobin Appelman2015-09-282-0/+328
* Merge pull request #19404 from owncloud/files-sidebar-sorttabsThomas Müller2015-09-286-3/+31
|\
| * Fix tabs order in files sidebarVincent Petry2015-09-286-3/+31
* | Merge pull request #19402 from owncloud/public-recognizeauthsessionThomas Müller2015-09-281-1/+4
|\ \
| * | Allow public auth to recognize sesssionVincent Petry2015-09-281-1/+4
| |/
* | Merge pull request #19401 from owncloud/files-actionsorderThomas Müller2015-09-284-0/+50
|\ \
| * | Fix order of actions in the files actions menuVincent Petry2015-09-284-0/+50
| |/
* | Merge pull request #19318 from owncloud/tarstreamerThomas Müller2015-09-283-63/+158
|\ \
| * | Updating submoduleThomas Müller2015-09-281-0/+0
| * | Updating TarStreamer to v0.1-beta3Thomas Müller2015-09-281-0/+0
| * | Adding ownCloud/TarStreamerThomas Müller2015-09-282-1/+1
| * | Uniform behavour for tar and zipVictor Dubiniuk2015-09-281-1/+6
| * | More correctionsVictor Dubiniuk2015-09-282-11/+7
| * | Add namespace. Fix broken zipVictor Dubiniuk2015-09-282-5/+8
| * | Add PHpdocVictor Dubiniuk2015-09-281-6/+40
| * | Introduce streamerVictor Dubiniuk2015-09-282-63/+120
| * | Add submodule dependencyVictor Dubiniuk2015-09-281-0/+0
|/ /
* | Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ngThomas Müller2015-09-2810-101/+516
|\ \
| * | do not throw exception when no attribute is specifiedArthur Schiwon2015-09-232-1/+107
| * | adjust to nested group fixArthur Schiwon2015-09-231-1/+6
| * | read all relevant user attributes on login and user search, in one query. sav...Arthur Schiwon2015-09-239-100/+404
* | | Merge pull request #19374 from owncloud/rename-config-testThomas Müller2015-09-281-2/+4
|\ \ \
| * | | rename config test to prevent autoloader issueRobin Appelman2015-09-281-2/+4
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-28480-450/+1622
* | | Merge pull request #19363 from owncloud/checkboxes-sidebarThomas Müller2015-09-283-10/+10
|\ \ \
| * | | restyle checkboxes in sidebarHendrik Leppelsack2015-09-253-10/+10
* | | | Merge pull request #19398 from owncloud/fix-tranifexThomas Müller2015-09-281-6/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove webdavauth from tranisfexThomas Müller2015-09-281-6/+0
* | | | Merge pull request #19379 from owncloud/remove-auth-button-borderThomas Müller2015-09-281-1/+2
|\ \ \ \
| * | | | remove border around button of password protected link confirmationJan-Christoph Borchardt2015-09-281-1/+2
* | | | | Merge pull request #19395 from owncloud/15037-universal-shebangThomas Müller2015-09-2818-18/+18
|\ \ \ \ \
| * | | | | Use a universal shebangOlivier Paroz2015-09-2718-18/+18
| | |/ / / | |/| | |
* | | | | Merge pull request #19394 from owncloud/18203-math-ceilThomas Müller2015-09-282-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Switch from Math.floor() to Math.ceil() when sending the dimension to PreviewOlivier Paroz2015-09-272-6/+6
| |/ / /
* | | | Merge pull request #19378 from owncloud/fix-sharing-autocompleteThomas Müller2015-09-281-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | fix name autocomplete not showing on mobile, fix #18551Jan-Christoph Borchardt2015-09-251-0/+4
* | | | Merge pull request #19380 from owncloud/gallery-icon-visibilityThomas Müller2015-09-2510-11/+42
|\ \ \ \
| * | | | increase visibility of slideshow controls, fix @owncloud/gallery#51Jan-Christoph Borchardt2015-09-2510-11/+42
| |/ / /
* | | | Merge pull request #19383 from owncloud/simplify-upload-iconThomas Müller2015-09-252-2/+2
|\ \ \ \
| * | | | simplify upload iconJan-Christoph Borchardt2015-09-252-2/+2
| |/ / /
* | | | Merge pull request #19366 from owncloud/fix-sidebar-spinnerRoeland Douma2015-09-252-4/+10
|\ \ \ \
| * | | | fix sidebar spinnerHendrik Leppelsack2015-09-252-4/+10
|/ / / /
* | | | Merge pull request #19362 from owncloud/fix_capabilities_shareAPIRoeland Douma2015-09-252-17/+62
|\ \ \ \
| * | | | Reflect enabled shareAPI in capabilitiesRoeland Jago Douma2015-09-252-17/+62
|/ / / /
* | | | Merge pull request #19346 from owncloud/drop-passwords-from-exception-logThomas Müller2015-09-254-9/+77
|\ \ \ \
| * | | | Remove passwords from logged exception stack tracesMorris Jobke2015-09-244-9/+77
* | | | | Merge pull request #19297 from owncloud/fix_19119Thomas Müller2015-09-252-1/+37
|\ \ \ \ \
| * | | | | Do not blindy copy expiration date on reshareRoeland Jago Douma2015-09-252-1/+37
| | |_|/ / | |/| | |
* | | | | Merge pull request #19357 from owncloud/add-config.sample.php-for-enforce-hom...Thomas Müller2015-09-251-0/+15
|\ \ \ \ \