Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9644 from owncloud/fix_user_api | Thomas Müller | 2014-07-15 | 2 | -3/+3 |
|\ | | | | | Fix user api | ||||
| * | use UserSession service to resolve user id | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -1/+1 |
| | | |||||
| * | use correct IUser in interface | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_results | blizzz | 2014-07-15 | 1 | -33/+22 |
|\ \ | |/ |/| | use fileinfo object in search results | ||||
| * | mkae getRelativePath of file search results overwriteable in subclasses | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -2/+1 |
| | | |||||
| * | return relative path | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -27/+15 |
| | | |||||
| * | use fileinfo object in search results | Jörn Friedrich Dreyer | 2014-07-09 | 1 | -9/+11 |
| | | |||||
* | | Merge pull request #8987 from owncloud/lastindexid-debug | Vincent Petry | 2014-07-15 | 2 | -2/+14 |
|\ \ | | | | | | | [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL | ||||
| * | | - Added test to trigger index id error | Vincent Petry | 2014-07-14 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | - re-enable encryption migration tests - sqlite requires reconnect after schema changes | ||||
* | | | Merge pull request #9561 from libasys/patch-3 | icewind1991 | 2014-07-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix Error undefined index: file_target | ||||
| * | | | Update share.php | libasys | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | change isset with empty on line 1911 | ||||
| * | | | Update share.php | libasys | 2014-07-10 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | Added isset for error: ``` Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911 ``` | ||||
* | | | Merge pull request #9621 from owncloud/fix_logger_implementation | Thomas Müller | 2014-07-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix logger implementation | ||||
| * | | | fix logger implementation and test | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-15 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #9562 from owncloud/users-groupfilter | Thomas Müller | 2014-07-15 | 1 | -50/+36 |
|\ \ \ | | | | | | | | | Do not filter groups, but therefore update the user counts according to the filter | ||||
| * | | | fixing PHPDoc | Thomas Müller | 2014-07-14 | 1 | -16/+16 |
| | | | | |||||
| * | | | remove dead code | Arthur Schiwon | 2014-07-14 | 1 | -34/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests | ||||
* | | | | Use the correct path when building the FileInfo for the search result | Robin Appelman | 2014-07-14 | 1 | -1/+2 |
|/ / / | |||||
* | | | Merge pull request #9228 from owncloud/remove-routing-singular-issues | Morris Jobke | 2014-07-14 | 1 | -12/+2 |
|\ \ \ | | | | | | | | | Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns | ||||
| * | | | use id instead of resourceId | Bernhard Posselt | 2014-06-26 | 1 | -11/+1 |
| | | | | |||||
| * | | | dont strip the s from the resource | Bernhard Posselt | 2014-06-26 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #9598 from owncloud/fix-app-installation-master | Thomas Müller | 2014-07-14 | 1 | -9/+4 |
|\ \ \ \ | | | | | | | | | | | append file extension to the temporary file which contains the downloade... | ||||
| * | | | | append file extension to the temporary file which contains the downloaded ↵ | Thomas Müller | 2014-07-11 | 1 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | | archive - in case of zip files fileinfo doesn't seem to return anything reliable | ||||
* | | | | | Expose the user manager in the public server container | Robin Appelman | 2014-07-14 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Add public interfaces for User, UserManager and UserSession | Robin Appelman | 2014-07-14 | 6 | -3/+229 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #9539 from enoch85/patch-1 | Björn Schießle | 2014-07-14 | 1 | -14/+11 |
|\ \ \ \ | | | | | | | | | | | Fix for #9422 | ||||
| * | | | | Fix for #9422 | Daniel Hansson | 2014-07-09 | 1 | -14/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #9571 from owncloud/fix_appstore_update_issue | Vincent Petry | 2014-07-14 | 2 | -9/+3 |
|\ \ \ \ | | | | | | | | | | | Fix update to button issue | ||||
| * | | | | improve check for duplicate apps | Georg Ehrke | 2014-07-10 | 1 | -7/+2 |
| | | | | | |||||
| * | | | | add proper version comparision in OC_Installer::isUpdateAvailable | Georg Ehrke | 2014-07-10 | 1 | -2/+1 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-13 | 1 | -1/+20 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-12 | 3 | -1/+24 |
| |/ / |/| | | |||||
* | | | Merge pull request #9536 from owncloud/default-app-groups-master | Morris Jobke | 2014-07-10 | 1 | -97/+97 |
|\ \ \ | |/ / |/| | | Default app groups master | ||||
| * | | adding 'groups' entry to remote apps | Thomas Müller | 2014-07-09 | 1 | -1/+2 |
| | | | |||||
| * | | fixing typos | Thomas Müller | 2014-07-09 | 1 | -97/+96 |
| | | | |||||
* | | | Merge pull request #9510 from libasys/patch-1 | Thomas Müller | 2014-07-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | BugFix missing $item on 'file_target' Line 1911 | ||||
| * | | | BugFix missing $item on 'file_target' Line 1911 | libasys | 2014-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | I think this should be right! | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-09 | 1 | -2/+5 |
| | | | | |||||
* | | | | Merge pull request #9507 from owncloud/fix-9302-master | Thomas Müller | 2014-07-08 | 2 | -104/+14 |
|\ \ \ \ | |_|/ / |/| | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put... | ||||
| * | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put() | Thomas Müller | 2014-07-08 | 2 | -104/+14 |
| |/ / | | | | | | | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort() | ||||
* | | | Merge pull request #9412 from owncloud/public-api-activity | Thomas Müller | 2014-07-08 | 4 | -2/+387 |
|\ \ \ | | | | | | | | | Public api activity | ||||
| * | | | Adding new interface \OCP\Activity\IExtentsion | Thomas Müller | 2014-07-08 | 4 | -2/+387 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding method getNotificationTypes() Adding method filterNotificationTypes() Adding method getDefaultTypes() Adding method translate() and getTypeIcon() Adding method getGroupParameter() Adding method getNavigation() Adding method getNavigation() Adding method isFilterValid() and getQueryForFilter() Adding unit tests for \OC\ActivityManager | ||||
* | | | port of #9500 | Arthur Schiwon | 2014-07-08 | 2 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't trigger update from checkPassword, it is already called by userExists, this is enough. do not write to database when the value is the same add test cases. also split test classes in a file each, looks like only the first class is being executed also appconfig shall not write to database if the value is unchanged | ||||
* | | | use case insensitive LIKE when searching for files in mysql | Robin Appelman | 2014-07-08 | 1 | -0/+2 |
| | | | |||||
* | | | Add repair step to set MySQL collation to utf8_bin | Robin Appelman | 2014-07-08 | 4 | -2/+79 |
|/ / | | | | | | | | | Set default collation of mysql connection to utf8_bin Set utf_bin as default collation for new tables | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-08 | 2 | -8/+15 |
| | | |||||
* | | Merge pull request #9502 from owncloud/add_ocsids | Morris Jobke | 2014-07-07 | 1 | -0/+3 |
|\ \ | | | | | | | Add ocsids for shipped apps in core repo | ||||
| * | | add ocsids to info.xml | Georg Ehrke | 2014-07-07 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #9494 from owncloud/issue/9490 | Morris Jobke | 2014-07-07 | 2 | -4/+12 |
|\ \ \ | |/ / |/| | | [issues/9490] \OC::$WEBROOT is invalid when called from cron.php |