summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-...Lukas Reschke2015-01-092-18/+15
|\
| * Verify whether type is correctLukas Reschke2015-01-082-18/+15
* | Merge pull request #12988 from owncloud/logfile_downloadMorris Jobke2015-01-0912-51/+297
|\ \
| * | add Download logfile button to admin settingsGeorg Ehrke2015-01-0712-51/+297
* | | Merge pull request #13148 from owncloud/self-destroying-notificationsMorris Jobke2015-01-082-0/+134
|\ \ \
| * | | Add timeout for notificationsMorris Jobke2015-01-082-0/+134
* | | | Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootlea...Thomas Müller2015-01-081-1/+3
|\ \ \ \
| * | | | Fix source path when share is a mount pointVincent Petry2015-01-081-1/+3
* | | | | Merge pull request #13165 from mypetyak/typos-in-external-storage-xmlLukas Reschke2015-01-081-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Minor typo updates to External Storage descriptionChristopher Bunn2015-01-071-2/+2
* | | | | Merge pull request #13172 from owncloud/addCheckForOldRewriteRulesToMakeOurCr...Lukas Reschke2015-01-084-3/+50
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add version to .htaccessLukas Reschke2015-01-084-3/+50
|/ / / /
* | | | Merge pull request #13166 from owncloud/support-setup-in-php-dev-serverMorris Jobke2015-01-081-0/+5
|\ \ \ \
| * | | | check for working htaccess will result in a dead lock because the server is b...Thomas Müller2015-01-081-0/+5
|/ / / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-01-08190-218/+172
|/ / /
* | | Merge #13074 from branch 'mmattel-smb_rename_text_root_to_subfolder'Morris Jobke2015-01-071-5/+5
|\ \ \
| * | | smb: rename textfield from root to subfolderMartin2015-01-071-5/+5
|/ / /
* | | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-073-6/+38
|\ \ \ | |/ / |/| |
| * | shareType and permissions are integersBjoern Schiessle2015-01-071-2/+2
| * | don't delete share table entries for the unique name if re-share permission w...Bjoern Schiessle2015-01-072-4/+36
* | | Merge pull request #13150 from owncloud/fix-sharing-activity-extensionMorris Jobke2015-01-071-5/+3
|\ \ \
| * | | Correctly return false when translating a foreign activityJoas Schilling2015-01-071-5/+3
|/ / /
* | | Merge pull request #12687 from owncloud/auto-escape-t-placeholdersMorris Jobke2015-01-075-17/+45
|\ \ \
| * | | Autoescape of placeholders in t() and p() - for JSMorris Jobke2015-01-075-17/+45
* | | | Merge pull request #13140 from owncloud/issue/13139-provisioning-api-testsMorris Jobke2015-01-074-310/+286
|\ \ \ \
| * | | | Extend Test\TestCase and do not use uniqid()Joas Schilling2015-01-074-310/+286
* | | | | Merge pull request #13138 from owncloud/issue/13134-incorrect-admin-warning-o...Lukas Reschke2015-01-072-6/+6
|\ \ \ \ \
| * | | | | Fix incorrect warning about setting the overwrite.cli.urlJoas Schilling2015-01-072-6/+6
* | | | | | Merge pull request #13132 from aptivate/improve_debug_logging_messagesMorris Jobke2015-01-072-9/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Improve debugging for ServiceUnavailable exceptionsChris Wilson2015-01-062-9/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #13063 from AdamWill/assets-relocateThomas Müller2015-01-074-7/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | allow css/js asset directory to be relocated (#13053)Adam Williamson2015-01-054-7/+19
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-07264-70/+338
* | | | | Merge pull request #13131 from owncloud/db-connect-stacktraceMorris Jobke2015-01-071-0/+10
|\ \ \ \ \
| * | | | | Prevent leaking db connection info in the stacktraceRobin Appelman2015-01-061-0/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #13126 from owncloud/update-jquery-strengthifyThomas Müller2015-01-063-51/+53
|\ \ \ \ \
| * | | | | bower update for jquery.strengthify 0.4.1Morris Jobke2015-01-062-50/+52
| * | | | | bump jquery.strengthify to 0.4.1Morris Jobke2015-01-061-1/+1
* | | | | | Merge pull request #13129 from owncloud/group-select-fix-autocompleteRobin Appelman2015-01-061-16/+12
|\ \ \ \ \ \
| * | | | | | Fix group select autocompleteRobin Appelman2015-01-061-16/+12
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #13130 from owncloud/getstoragestats-error-handlingLukas Reschke2015-01-062-1/+8
|\ \ \ \ \ \
| * | | | | | Add error handling to getstoragestats.phpRobin Appelman2015-01-062-1/+8
| |/ / / / /
* | | | | | Merge pull request #13128 from owncloud/files-scan-pathThomas Müller2015-01-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fix check if a path argument is passed to occ files:scanRobin Appelman2015-01-061-1/+1
| |/ / / / /
* | | | | | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-0626-289/+983
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | use cancelable timeout, on scroll only fetch next page if last query had any ...Jörn Friedrich Dreyer2015-01-061-21/+25
| * | | | | use class for no results div instead of id. the elements are not unique.Jörn Friedrich Dreyer2015-01-067-12/+12
| * | | | | clear search when navigating via breadcrumbsJörn Friedrich Dreyer2015-01-061-0/+1
| * | | | | correctly clear searchbox when switching filelistsJörn Friedrich Dreyer2015-01-052-0/+11
| * | | | | fix onScroll breaking search, fix keyboard navigation, fix filter for files i...Jörn Friedrich Dreyer2015-01-052-3/+8