summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move \OCP\Diagnostics to PSR-4 (#24667)Roeland Douma2016-05-174-0/+0
|
* Move \OCP\Authentication to PSR-4 (#24632)Roeland Douma2016-05-171-0/+0
|
* Move \OCP\Console to PSR-4 (#24636)Roeland Douma2016-05-171-0/+0
|
* Move \OCP\Contacts to PSR-4 (#24645)Roeland Douma2016-05-171-0/+0
|
* Merge pull request #24634 from owncloud/sharesettings-sortVincent Petry2016-05-171-7/+7
|\ | | | | fix admin link share settings sorting, use same order as in sidebar
| * fix admin share settings sorting, use same order as in sidebarJan-Christoph Borchardt2016-05-141-7/+7
| |
* | Merge pull request #24630 from owncloud/one-shall-adjust-the-pathVincent Petry2016-05-171-1/+1
|\ \ | | | | | | Use proper path
| * | Use proper pathLukas Reschke2016-05-031-1/+1
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/24407
* | | Merge pull request #24370 from owncloud/iclientservice-dicontainerJörn Friedrich Dreyer2016-05-171-0/+4
|\ \ \ | | | | | | | | add IClientService to DI container
| * | | add IClientService to DI containerChristoph Wurst2016-05-011-0/+4
| | | |
* | | | Merge pull request #24083 from owncloud/fix-race-conditionJörn Friedrich Dreyer2016-05-172-2/+4
|\ \ \ \ | | | | | | | | | | Read only once
| * | | | Read only onceLukas Reschke2016-05-022-2/+4
| | | | | | | | | | | | | | | | | | | | This can lead to race conditions otherwise. Also depracted hasKey
* | | | | Merge pull request #24006 from owncloud/audio_m4aJörn Friedrich Dreyer2016-05-171-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Adding mimetypes for m4a and m4b
| * | | | | Adding mimetypes for m4a and m4bMartin2016-04-141-0/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1724-6/+194
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1634-2/+128
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-15158-42/+384
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-14256-262/+24
| | | | | |
* | | | | | Merge pull request #24617 from owncloud/autoloader_no_privateVincent Petry2016-05-132-36/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | our autoloader should not load classes in \OC
| * | | | | | Fix unit testsRoeland Jago Douma2016-05-131-18/+4
| | | | | | |
| * | | | | | All \OC\ classes are handled by the composer autoloaderRoeland Jago Douma2016-05-131-17/+0
| | | | | | |
| * | | | | | OC_xx all live in the legacy folderRoeland Jago Douma2016-05-131-1/+0
| | | | | | |
* | | | | | | Merge pull request #22341 from ↵Vincent Petry2016-05-132-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop Handle case when breadcrumb and filelist item overlap and both receive a drop
| * | | | | | | Handle case when breadcrumb and filelist item overlapPellaeon Lin2016-03-172-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and both receive a drop. Build breadcrumb over and out callback in filelist.js and pass them as options to utilize local selectors of filelist Re-enable td elements after drop to bread crumb Fix# drop handler still being called after enable, it seems that waiting for a short time before re-enabling solves the problem * Add explanations for setTimeout re-enable td.filename drop handler
* | | | | | | | Merge pull request #22214 from owncloud/ext-better-dropbox-gdriveVincent Petry2016-05-1315-29/+111
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Direct links to Google Drive/Dropbox configuration pages from external storage config
| * | | | | | | | Move Dropbox/GDrive link to iconRobin McCorkell2016-05-033-8/+17
| | | | | | | | |
| * | | | | | | | Change colour of input fields instead of printing 'Access granted'Robin McCorkell2016-05-033-11/+16
| | | | | | | | |
| * | | | | | | | Add links to load GDrive/Dropbox configuration pagesRobin McCorkell2016-05-036-4/+58
| | | | | | | | |
| * | | | | | | | Allow multiple custom JS filesRobin McCorkell2016-05-038-18/+32
| | | | | | | | |
* | | | | | | | | Merge pull request #24600 from owncloud/http-client-lazy-configVincent Petry2016-05-131-6/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | only configure the http client once we start using it
| * | | | | | | | | only configure the http client once we start using itRobin Appelman2016-05-121-6/+23
| | | | | | | | | |
* | | | | | | | | | Merge pull request #24614 from owncloud/token-validation-logVincent Petry2016-05-131-3/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | don't spam the log file with failed token validation entries
| * | | | | | | | | | don't spam the log file with failed token validation entriesChristoph Wurst2016-05-131-3/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #24594 from owncloud/authtoken-name-column-sizeVincent Petry2016-05-133-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Use CLOB for auth token names to allow long user agent strings
| * | | | | | | | | | Use CLOB for auth token names to allow long user agent stringsChristoph Wurst2016-05-123-4/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #24601 from owncloud/template_psr4Vincent Petry2016-05-139-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Template to PSR-4
| * | | | | | | | | | | Move \OC\Template to PSR-4Roeland Jago Douma2016-05-136-0/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Move functions.php to legacyRoeland Jago Douma2016-05-133-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file should really be properly namespaced etc!
* | | | | | | | | | | Merge pull request #24605 from ↵Vincent Petry2016-05-134-9/+120
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/luckydonald-Superduper-Progressbar-branch-thingie Luckydonald superduper progressbar branch thingie
| * | | | | | | | | | Merge branch 'Superduper-Progressbar-branch-thingie' of ↵Vincent Petry2016-05-124-9/+120
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie
| | * | | | | | | | | | Optimized time formatting, optimized time smoothing.luckydonald2014-08-141-11/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Changes for scrutinizer. Yay!luckydonald2014-08-131-15/+29
| | | | | | | | | | | |
| | * | | | | | | | | | fixed browser showing the tipsy tooltip as default tooltip twice.luckydonald2014-08-131-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed "Any minute now" staying because of undefined buffer. Also increased ↵luckydonald2014-08-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer size to 20 to be less jittery.
| | * | | | | | | | | | Updated String formatting. Label font-weight was already normal.luckydonald2014-08-132-11/+11
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed Positioning, fixed formatting for both mobile and desktop.luckydonald2014-08-132-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tooltips still frustrate me- And the updated code with tabs nicely. yay.
| | * | | | | | | | | | Added remaining time displaying, moved Information to tooltip, removed now ↵luckydonald2014-08-123-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unneeded speed div
| | * | | | | | | | | | ...in case the text gets to big, don't wrap to new line. Instead just cut it.luckydonald2014-08-111-0/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Updated and optimized Mobile Layout as well.luckydonald2014-08-114-4/+19
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed translations, indentation and renamed the .percents class to .speed class.luckydonald2014-08-103-10/+10
| | | | | | | | | | | |