summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefileThomas Müller2015-01-272-4/+124
|\ \ \ \ \ \
| * | | | | | Only reload file list after remote share accept request returnsVincent Petry2015-01-262-4/+124
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-01-272-0/+2
|/ / / / /
* | | | | Merge pull request #13490 from owncloud/fix_reshare_s2s_shareVincent Petry2015-01-267-39/+64
|\ \ \ \ \
| * | | | | certificate manager should always use a \OC\Files\View otherwise we will get ...Bjoern Schiessle2015-01-261-1/+26
| * | | | | certificate manager only needs the user-id, no need to pass on the complete u...Bjoern Schiessle2015-01-263-5/+6
| * | | | | use uid provided by setupfs hook to mount server2server shares, otherwise mou...Bjoern Schiessle2015-01-265-35/+34
* | | | | | Prevent double slash in shareinfo request URLVincent Petry2015-01-261-1/+1
|/ / / / /
* | | | | Remove duplicated definition of APIControllerJoas Schilling2015-01-261-12/+0
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2516-14/+58
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-246-2/+6
* | | | | by default send mail for new server-to-server shareBjoern Schiessle2015-01-232-3/+75
* | | | | Ignore favorites that are not available when creating the favorites listJoas Schilling2015-01-232-3/+19
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2316-2/+50
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-22112-232/+120
* | | | Merge pull request #13517 from owncloud/keymanager-storageMorris Jobke2015-01-221-12/+9
|\ \ \ \
| * | | | Bypass the view when storing encryption keysRobin Appelman2015-01-201-12/+9
* | | | | Merge pull request #13568 from owncloud/s2s_delete_shares_jenkinsMorris Jobke2015-01-224-0/+144
|\ \ \ \ \
| * | | | | delete all server-to-server shares if a user gets deletedBjoern Schiessle2015-01-214-0/+144
| | |_|/ / | |/| | |
* / | | | Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
|/ / / /
* | | | Merge pull request #13432 from owncloud/animate_gifs_public_sharingThomas Müller2015-01-214-3/+20
|\ \ \ \
| * | | | show animated gifs on public sharing pageGeorg Ehrke2015-01-194-3/+20
* | | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialogThomas Müller2015-01-212-58/+202
|\ \ \ \ \
| * | | | | Add unit test for external share JS dialogVincent Petry2015-01-212-57/+200
| * | | | | External share dialog must properly read entered passwordVincent Petry2015-01-211-1/+2
| | |_|/ / | |/| | |
* | | | | Fixed external cache test namespaceVincent Petry2015-01-211-1/+3
* | | | | Fix webdav mkdir for remote sharesVincent Petry2015-01-212-0/+115
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2114-44/+106
* | | | Merge pull request #13520 from owncloud/fix-comparison-opLukas Reschke2015-01-201-1/+1
|\ \ \ \
| * | | | this must be larger then (>), since buggy behaviour occurs when the parameter...Arthur Schiwon2015-01-201-1/+1
| | |/ / | |/| |
* / | | avoid $this->cache being null - fixes #13491Thomas Müller2015-01-201-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2020-10/+56
* | | Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-fro...Morris Jobke2015-01-191-2/+11
|\ \ \
| * | | Prioritise Basic Auth header over CookieLukas Reschke2015-01-171-2/+11
| |/ /
* | | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
* | | Merge pull request #13461 from owncloud/remove-strip-slashesThomas Müller2015-01-191-2/+1
|\ \ \
| * | | Remove stripslashes() from newfolder.phpLukas Reschke2015-01-191-2/+1
* | | | Merge pull request #13457 from owncloud/enc-skippartfilesThomas Müller2015-01-191-0/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Add class attribute types in encryption Util classVincent Petry2015-01-191-0/+51
| * | | Skip stray part files during initial encryptionVincent Petry2015-01-191-0/+4
* | | | Merge pull request #13377 from owncloud/trashbin_storage_wrapperMorris Jobke2015-01-199-53/+109
|\ \ \ \
| * | | | replace hook with storage wrapperBjoern Schiessle2015-01-199-53/+109
| |/ / /
* | | | Merge pull request #13362 from owncloud/fix-11442Thomas Müller2015-01-193-38/+92
|\ \ \ \ | |/ / / |/| | |
| * | | coding styleArthur Schiwon2015-01-152-5/+8
| * | | update user or group count only, when the multiselect is closedArthur Schiwon2015-01-141-4/+34
| * | | allow to read again objectclasses and groups under certain conditionsArthur Schiwon2015-01-142-2/+31
| * | | JS cleanupArthur Schiwon2015-01-133-34/+26
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-196-12/+12
* | | | Merge pull request #13276 from Sugaroverdose/fix_#11348Morris Jobke2015-01-182-4/+18
|\ \ \ \
| * | | | Add ie8 text-overflow: ellipsis supportSugaroverdose2015-01-171-0/+11