summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-148-2/+16
|
* Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroupMorris Jobke2014-11-131-0/+4
|\ | | | | cleanup group admin(s) on deleteGroup
| * cleanup group admin(s) on deleteGroupmichag862014-10-081-0/+4
| |
* | Merge pull request #12157 from owncloud/fix-autotest-conditionVincent Petry2014-11-131-1/+1
|\ \ | | | | | | this allows a non-existant config/config.php for starting the autotest.s...
| * | this allows a non-existant config/config.php for starting the autotest.shMorris Jobke2014-11-131-1/+1
| | |
* | | Merge pull request #12158 from owncloud/drop-snapjsMorris Jobke2014-11-131-785/+0
|\ \ \ | | | | | | | | remove unneeded snap.js - followup to #11985 - ref #12156
| * | | remove unneeded snap.js - followup to #11985 - ref #12156Morris Jobke2014-11-131-785/+0
| | | |
* | | | Merge pull request #11956 from ↵Morris Jobke2014-11-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/remove-check-for-allow_user_to_change_display_name removal of wrong/double implemented check
| * | | | removal of wrong/double implemented checkmichag862014-11-131-1/+1
| | |/ / | |/| | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php
* | | | Merge pull request #12005 from owncloud/bower-multiselectblizzz2014-11-135-3/+23
|\ \ \ \ | |_|/ / |/| | | Move multiselect to user_ldap
| * | | Migrate multiselect to user_ldapMorris Jobke2014-11-135-3/+23
| | | |
* | | | Run preupdate before an updateLukas Reschke2014-11-132-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
* | | | Merge pull request #9177 from owncloud/jsdocexperimentVincent Petry2014-11-1325-71/+446
|\ \ \ \ | |_|/ / |/| | | Improved JS Docs + added build script for JS Docs
| * | | Improved Javascript docs for JSDocVincent Petry2014-10-3123-71/+403
| | | | | | | | | | | | | | | | | | | | | | | | Added namespaces so that JSDoc can find them. Fixed a few warnings. Improved some comments.
| * | | Added script to build the JS documentationVincent Petry2014-10-312-0/+43
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1336-24/+80
| | | |
* | | | Merge pull request #12141 from owncloud/kill-dav-clientMorris Jobke2014-11-121-59/+0
|\ \ \ \ | |_|/ / |/| | | OC_DAVClient is not longer used - no need to carry it around anymore
| * | | OC_DAVClient is not longer used - no need to carry it around anymoreThomas Müller2014-11-121-59/+0
| | | |
* | | | Merge pull request #12087 from AdamWill/google-touchVincent Petry2014-11-121-1/+4
|\ \ \ \ | | | | | | | | | | google: fix touch() when $mtime is set (Google wants RFC3339) #11267
| * | | | fix touch() when $mtime is set (Google wants RFC3339) #11267Adam Williamson2014-11-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud passes us a Unix time integer, but the GDrive API wants an RFC3339-formatted date. Actually it wants a single particular RFC3339 format, not just anything that complies will do - it requires the fractions to be specified, though RFC3339 doesn't. This resolves issue #11267 (and was also noted by PVince81 in reviewing PR #6989).
* | | | | Merge pull request #12139 from owncloud/DoNotTouchMeThomas Müller2014-11-121-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Try to read the file only instead of trying to touch
| * | | | | Try to read the file only instead of trying to touchLukas Reschke2014-11-121-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening. Fixes https://github.com/owncloud/core/issues/12135
* | | | | Merge pull request #12128 from owncloud/drop-formfactorJan-Christoph Borchardt2014-11-127-118/+20
|\ \ \ \ \ | | | | | | | | | | | | Drop form_factor that is appended to JS, CSS and template filenames
| * | | | | Drop form_factor that is appended to JS, CSS and template filenamesMorris Jobke2014-11-127-118/+20
| | | | | |
* | | | | | Merge pull request #12126 from owncloud/remove-debug-statementLukas Reschke2014-11-121-4/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove debug statement
| * | | | | Remove debug statementLukas Reschke2014-11-121-4/+0
|/ / / / / | | | | | | | | | | | | | | | Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
* | | | | Merge pull request #12110 from owncloud/fix-12080Thomas Müller2014-11-122-2/+2
|\ \ \ \ \ | | | | | | | | | | | | add 'namespace' for automatically created navigation divs, fixes #12080
| * | | | | add 'namespace' for automatically created navigation divs, fixes #12080Arthur Schiwon2014-11-122-2/+2
| | | | | |
* | | | | | Merge pull request #12093 from AdamWill/storage-test-touchMorris Jobke2014-11-121-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | storage test: use new file for testTouchCreateFile()
| * | | | | storage test: use new file for testTouchCreateFile()Adam Williamson2014-11-101-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this test would never succeed, because the previous test - testFOpen() - creates the file 'foo', but testTouchCreateFile() starts out by asserting it doesn't exist. Change the test to use a file called 'touch' instead (which does not previously exist).
* | | | | Merge pull request #12105 from owncloud/dav-fixcleanpathThomas Müller2014-11-121-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix root path handling for WebDAV ext storage
| * | | | | Fix root path handling for WebDAV ext storageVincent Petry2014-11-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing cleanPath() call that converts "/" to "" when calling SabreDAV. This is needed because SabreDAV will discard its base URL when passing "/".
* | | | | | Merge pull request #12107 from owncloud/dav-propfindmimetypeThomas Müller2014-11-121-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return real mime type on PROPFIND
| * | | | | | Return real mime type on PROPFINDVincent Petry2014-11-111-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Return the real (insecure) mime type on PROPFIND
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1222-10/+60
| | | | | |
* | | | | | Merge pull request #12114 from owncloud/fix-pimpleMorris Jobke2014-11-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Pimple unset
| * | | | | | Fix Pimple unsetBernhard Posselt2014-11-111-1/+1
|/ / / / / /
* | | | | | Merge pull request #11917 from owncloud/fix-11909Thomas Müller2014-11-1110-36/+311
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add checkbox to enforce SSL for subdomains
| * | | | | Migrate "setsecurity.php" to the AppFrameworkLukas Reschke2014-11-0310-36/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add switch to enforce SSL for subdomains Add unit tests Add test for boolean values Camel-case Fix ugly JS
* | | | | | Merge pull request #11929 from owncloud/fix-db-centerJan-Christoph Borchardt2014-11-111-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | fixes not centered database chooser on setup page
| * | | | | | fixes not centered database chooser on setup pageMorris Jobke2014-11-031-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #11927
* | | | | | | Merge pull request #12100 from owncloud/fix-infinite-loopMorris Jobke2014-11-111-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix infinite loop if count and limit is 0
| * | | | | | Fix infinite loop if count and limit is 0Morris Jobke2014-11-111-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | * otherwise it will always think it hits the limit and need another round to fetch additional results
* | | | | | Merge pull request #11789 from owncloud/fix-11762Morris Jobke2014-11-112-3/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | [LDAP] Login: dont fail with 500 if configured display name attribute is not set
| * | | | | | dont fail with 500 if configured display name attribute is not setArthur Schiwon2014-10-272-3/+29
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-11142-350/+228
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #10966 from owncloud/storage-root-share-permissionsMorris Jobke2014-11-102-0/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont' use mountpoint permissions as share permissions for external storages
| * | | | | | Add unit testsRobin Appelman2014-10-311-0/+85
| | | | | | |
| * | | | | | Keep the share permissions from mountpointsRobin Appelman2014-10-311-1/+2
| | | | | | |
| * | | | | | Dont' use mountpoint permissions as share permissions for external storagesRobin Appelman2014-10-311-0/+4
| | | | | | |