summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Ensure user mountpoints are setup when using getUserFolderRobin Appelman2014-12-111-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12781 from owncloud/jenkins-curl-open-basedirMorris Jobke2014-12-116-9/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check if open_basedir is setLukas Reschke2014-12-115-11/+60
| * | | | | | | | | Add IniGetWrapper to public interfaceLukas Reschke2014-12-112-1/+20
* | | | | | | | | | Merge pull request #12780 from owncloud/make-datetimeformattertest-reliableJoas Schilling2014-12-111-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use a fixed timestamp so we dont switch days/years with the getTimestampAgoJoas Schilling2014-12-111-4/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #12779 from owncloud/correctly-fall-back-pluralsThomas Müller2014-12-114-4/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Correctly fallback to english, if the plural case is not translatedJoas Schilling2014-12-114-4/+41
|/ / / / / / / / /
* | | | | | | | | Merge pull request #12776 from owncloud/fix-go-agoJan-Christoph Borchardt2014-12-111-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | year go -> year agoThomas Müller2014-12-111-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #12738 from owncloud/cleanup-build-dirThomas Müller2014-12-114-273/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | cleaning up the build directoryThomas Müller2014-12-104-273/+2
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-11324-1652/+1724
| |/ / / / / / / |/| | | | | | |
* | | | | | | | update 3rdparty submoduleMorris Jobke2014-12-101-0/+0
* | | | | | | | Merge pull request #12742 from owncloud/fix-pear.phpMorris Jobke2014-12-101-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Update 3rdparty to add PEAR.php backThomas Müller2014-12-101-0/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #12761 from owncloud/error-details2Lukas Reschke2014-12-102-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | improve update error page: adjust line height of h2Jan-Christoph Borchardt2014-12-101-0/+1
| * | | | | | | | improve update error page: remove box, make link visible, insert missing spac...Jan-Christoph Borchardt2014-12-102-3/+7
* | | | | | | | | Merge pull request #12758 from owncloud/fix-config-doc-blockMorris Jobke2014-12-102-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add type of the variables to the docsJoas Schilling2014-12-102-6/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12746 from owncloud/skip-longpath-test-againThomas Müller2014-12-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | skip testLongPath()Thomas Müller2014-12-101-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #11892 from owncloud/remove_triggerupdateThomas Müller2014-12-104-38/+39
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | make path absoluteJörn Friedrich Dreyer2014-12-103-10/+17
| * | | | | | | | add quiet option, ref #8794Jörn Friedrich Dreyer2014-12-041-9/+18
| * | | | | | | | remove triggerupdate, ref #11872Jörn Friedrich Dreyer2014-12-043-28/+13
* | | | | | | | | Merge pull request #12750 from owncloud/cache-numericstorageidfixRobin Appelman2014-12-102-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix numeric storage id for cache wrapperVincent Petry2014-12-102-0/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12485 from owncloud/jenkins-12383Joas Schilling2014-12-1011-63/+655
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Require the interface and return a string instead of private classesJoas Schilling2014-12-102-54/+54
| * | | | | | | | Deprecate Util::formatDate()Joas Schilling2014-12-107-62/+81
| * | | | | | | | Add sometests and copy tests from Util::formatDate to new classJoas Schilling2014-12-091-0/+177
| * | | | | | | | Add a DateTimeFormatter class which allows overwriting the language and timezoneJoas Schilling2014-12-093-1/+397
* | | | | | | | | Merge pull request #12611 from owncloud/use-uid-instead-of-loginnameLukas Reschke2014-12-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Use UID instead of login nameLukas Reschke2014-12-041-1/+1
* | | | | | | | | Merge pull request #12711 from owncloud/add-backend-to-rest-indexLukas Reschke2014-12-107-89/+155
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make class compatibleLukas Reschke2014-12-091-0/+3
| * | | | | | | | | Expose backend type via REST APILukas Reschke2014-12-096-89/+152
* | | | | | | | | | Merge pull request #12737 from owncloud/fix-missing-nl-phpstormThomas Müller2014-12-101-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Add newline that was removed by 15be763d46d56c57d4f0def7745bb02d513e3a38Joas Schilling2014-12-101-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #12090 from AdamWill/google-rename-deleteMorris Jobke2014-12-101-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | google: delete original after successful renameAdam Williamson2014-11-301-0/+12
* | | | | | | | | | Merge pull request #12549 from owncloud/shared-cache-non-existingMorris Jobke2014-12-101-10/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Dont return cached date in shared cache when the file doesn't existRobin Appelman2014-12-021-10/+12
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-10286-78/+430
* | | | | | | | | | | Merge pull request #12664 from owncloud/fix-12164Thomas Müller2014-12-105-35/+119
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove leftoverVictor Dubiniuk2014-12-101-1/+0
| * | | | | | | | | | | Inject configVictor Dubiniuk2014-12-105-34/+46
| * | | | | | | | | | | Fix tests. Add two more test casesVictor Dubiniuk2014-12-082-45/+59