aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* move loading of JS and CSS to templateMorris Jobke2014-12-122-8/+13
|
* remove PHP generated user list and move all to the existing JS partMorris Jobke2014-12-123-104/+31
|
* Merge pull request #12781 from owncloud/jenkins-curl-open-basedirMorris Jobke2014-12-116-9/+77
|\ | | | | [Jenkins only] curl open basedir
| * Check if open_basedir is setLukas Reschke2014-12-115-11/+60
| | | | | | | | | | | | The file:// protocol does not work with curl when an open_basedir is set. This fixes https://github.com/owncloud/core/issues/12016
| * 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 getTimestampAgo
| * | 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 translated
| * | 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 ago
| * | 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 directory
| * | 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 back
| * | 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: remove box, make link visible, insert missing space, remove line break
| * | 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 ↵Jan-Christoph Borchardt2014-12-102-3/+7
| | | | | | | | | | | | space, remove line break
* | | Merge pull request #12758 from owncloud/fix-config-doc-blockMorris Jobke2014-12-102-6/+6
|\ \ \ | | | | | | | | Add type of the variables to the docs
| * | | 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()
| * | | | skip testLongPath()Thomas Müller2014-12-101-1/+1
| | | | |
* | | | | Merge pull request #11892 from owncloud/remove_triggerupdateThomas Müller2014-12-104-38/+39
|\ \ \ \ \ | |_|/ / / |/| | | | Remove triggerupdate.php & add quiet option for CLI scanner
| * | | | 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 wrapper
| * | | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | New DateTimeFormatter class for dates in other timezones and languages
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Make DateTimeFormatter a service and adjust tests that have been inaccurate
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Fix #12227
* | | | | Merge pull request #12611 from owncloud/use-uid-instead-of-loginnameLukas Reschke2014-12-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Use UID instead of login name
| * | | | Use UID instead of login nameLukas Reschke2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | Login name can be something different and thus I'm pretty sure this will break in combination with external auth providers such as LDAP.
* | | | | Merge pull request #12711 from owncloud/add-backend-to-rest-indexLukas Reschke2014-12-107-89/+155
|\ \ \ \ \ | | | | | | | | | | | | Expose backend type via REST API
| * | | | | Make class compatibleLukas Reschke2014-12-091-0/+3
| | | | | |
| * | | | | Expose backend type via REST APILukas Reschke2014-12-096-89/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620. For example: ````json [{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}] ```
* | | | | | Merge pull request #12737 from owncloud/fix-missing-nl-phpstormThomas Müller2014-12-101-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add newline that was removed by 15be763d46d56c57d4f0def7745bb02d513e3a38
| * | | | | 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 rename
| * | | | | google: delete original after successful renameAdam Williamson2014-11-301-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GDrive, filenames aren't unique, and directories are just special files - so you can have multiple files with the same name, multiple directories with the same name, and even files with the same names as directories. OC doesn't handle this at all, though, and just wants to act as if file and directory names *are* unique. So when renaming, we must check if there's an existing object with the same file or directory name before we commit the rename, and explicitly delete it if the rename is successful. (Other providers like dropbox do the same for files, but intentionally don't do it for directories; we really need to do it for directories too.) A good way to observe this is to run the storage unit tests and look at the state of the Drive afterwards. Without this commit, there will be several copies of all the test files and directories. After this commit, there's just one of each. We can't just say "hey, Drive lets us do this, what's the problem?" because we don't handle multiple-objects, same-name cases - getDriveFile() just bails and prints an error if it searches for the file or directory with a given name and gets multiple results.
* | | | | | 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 exist
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use httphelper and cache response even when it is empty
| * | | | | | | Remove leftoverVictor Dubiniuk2014-12-101-1/+0
| | | | | | | |
| * | | | | | | Inject configVictor Dubiniuk2014-12-105-34/+46
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 17:06:14 +0000