aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Fix null pointer exception in user_ldap (#25062)Jörn Friedrich Dreyer2016-06-211-1/+8
* Merge pull request #24505 from owncloud/ceph-wait-for-httpVincent Petry2016-06-211-0/+5
|\
| * Wait for port being accessible in addition to the notify socketThomas Müller2016-06-171-0/+5
* | Contacts API: replace raw image data with url (#25081)Georg Ehrke2016-06-2111-39/+384
* | fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
* | Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
* | Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
* | Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
* | Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
|\ \
| * | Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| |/
* | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-203-7/+87
|\ \
| * | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-2/+2
| * | throw PasswordLoginForbidden on DAVChristoph Wurst2016-06-173-3/+60
| * | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-172-6/+29
* | | Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
|\ \ \
| * | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
* | | | Merge pull request #25010 from owncloud/gdrive-fix-testsVincent Petry2016-06-201-2/+2
|\ \ \ \
| * | | | Fix GDrive test rename overwrite folderVincent Petry2016-06-101-2/+2
* | | | | Merge pull request #25161 from owncloud/fixgetsharefolderVincent Petry2016-06-202-5/+9
|\ \ \ \ \
| * | | | | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | |_|/ / | |/| | |
* | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newlineVincent Petry2016-06-202-3/+7
|\ \ \ \ \
| * | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-3/+7
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2010-2/+56
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
|/ / / /
* / / / Changed global variable to localSergio Bertolín2016-06-171-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1718-4/+116
* | | Merge pull request #24965 from owncloud/streams-0.4.1Vincent Petry2016-06-165-52/+39
|\ \ \
| * | | update icewind/streams to 0.4.1Robin Appelman2016-06-155-52/+39
| | |/ | |/|
* | | Move birthday calendar generation to a live migration job (#25135)Thomas Müller2016-06-165-66/+84
* | | Merge pull request #25104 from owncloud/dropbox-catchratelimitVincent Petry2016-06-161-0/+5
|\ \ \
| * | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-141-0/+5
* | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolderVincent Petry2016-06-162-1/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| |/ /
* | | Merge pull request #25082 from owncloud/fix-sessionless-clientsVincent Petry2016-06-152-14/+6
|\ \ \
| * | | create session token only for clients that support cookiesChristoph Wurst2016-06-131-12/+5
| * | | create session token on all APIsChristoph Wurst2016-06-131-2/+1
* | | | Update start-swift-ceph.sh (#25109)Jürgen Weigert2016-06-151-0/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-158-2/+10
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-146-0/+56
* | | Use proper namespaces - fixes #25078 (#25079)Thomas Müller2016-06-131-1/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1322-12/+134
* | Merge pull request #25003 from owncloud/fix_ocs_path_responseVincent Petry2016-06-103-21/+65
|\ \ | |/ |/|
| * Extend unit testsRoeland Jago Douma2016-06-071-1/+33
| * Fix unit testsRoeland Jago Douma2016-06-072-9/+21
| * Show the path relative to the requesting userRoeland Jago Douma2016-06-071-12/+12
* | Merge pull request #24990 from owncloud/fix_24868Vincent Petry2016-06-101-6/+3
|\ \
| * | Wrap publicwebdav in sharePermission maskRoeland Jago Douma2016-06-061-6/+3
* | | Merge pull request #24080 from owncloud/support-calendar-class-propertyVincent Petry2016-06-1011-153/+751
|\ \ \
| * | | Filter confidential calendar objects in shared calendarsThomas Müller2016-06-094-3/+322
| * | | Added unit testing for the migration stepThomas Müller2016-06-095-126/+254