Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11029 from owncloud/fix-share-download | Clark Tomlinson | 2014-11-14 | 14 | -246/+751 |
|\ | |||||
| * | Added download size on public sharing | Vincent Cloutier | 2014-11-14 | 3 | -2/+4 |
| * | Refactor file sharing public link handling | Lukas Reschke | 2014-11-14 | 14 | -245/+748 |
|/ | |||||
* | Merge pull request #12181 from owncloud/resubmit-second-fail | Thomas Müller | 2014-11-14 | 1 | -1/+1 |
|\ | |||||
| * | Fail... | Lukas Reschke | 2014-11-14 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #12177 from owncloud/skip-mail-test-for | Thomas Müller | 2014-11-14 | 1 | -0/+6 |
|\ | |||||
| * | Mark skipped until #12085 is merged | Lukas Reschke | 2014-11-14 | 1 | -0/+6 |
|/ | |||||
* | Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename | Jörn Friedrich Dreyer | 2014-11-14 | 1 | -4/+1 |
|\ | |||||
| * | Do not remove dir entry if it has the same name as the parent | Vincent Petry | 2014-11-13 | 1 | -4/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-14 | 8 | -2/+16 |
* | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup | Morris Jobke | 2014-11-13 | 1 | -0/+4 |
|\ \ | |||||
| * | | cleanup group admin(s) on deleteGroup | michag86 | 2014-10-08 | 1 | -0/+4 |
* | | | Merge pull request #12157 from owncloud/fix-autotest-condition | Vincent Petry | 2014-11-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | this allows a non-existant config/config.php for starting the autotest.sh | Morris Jobke | 2014-11-13 | 1 | -1/+1 |
* | | | | Merge pull request #12158 from owncloud/drop-snapjs | Morris Jobke | 2014-11-13 | 1 | -785/+0 |
|\ \ \ \ | |||||
| * | | | | remove unneeded snap.js - followup to #11985 - ref #12156 | Morris Jobke | 2014-11-13 | 1 | -785/+0 |
* | | | | | Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change... | Morris Jobke | 2014-11-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | removal of wrong/double implemented check | michag86 | 2014-11-13 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12005 from owncloud/bower-multiselect | blizzz | 2014-11-13 | 5 | -3/+23 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Migrate multiselect to user_ldap | Morris Jobke | 2014-11-13 | 5 | -3/+23 |
* | | | | Run preupdate before an update | Lukas Reschke | 2014-11-13 | 2 | -5/+17 |
* | | | | Merge pull request #9177 from owncloud/jsdocexperiment | Vincent Petry | 2014-11-13 | 25 | -71/+446 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Improved Javascript docs for JSDoc | Vincent Petry | 2014-10-31 | 23 | -71/+403 |
| * | | | Added script to build the JS documentation | Vincent Petry | 2014-10-31 | 2 | -0/+43 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-13 | 36 | -24/+80 |
* | | | | Merge pull request #12141 from owncloud/kill-dav-client | Morris Jobke | 2014-11-12 | 1 | -59/+0 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | OC_DAVClient is not longer used - no need to carry it around anymore | Thomas Müller | 2014-11-12 | 1 | -59/+0 |
* | | | | Merge pull request #12087 from AdamWill/google-touch | Vincent Petry | 2014-11-12 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | fix touch() when $mtime is set (Google wants RFC3339) #11267 | Adam Williamson | 2014-11-10 | 1 | -1/+4 |
* | | | | | Merge pull request #12139 from owncloud/DoNotTouchMe | Thomas Müller | 2014-11-12 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Try to read the file only instead of trying to touch | Lukas Reschke | 2014-11-12 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #12128 from owncloud/drop-formfactor | Jan-Christoph Borchardt | 2014-11-12 | 7 | -118/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Drop form_factor that is appended to JS, CSS and template filenames | Morris Jobke | 2014-11-12 | 7 | -118/+20 |
* | | | | | | Merge pull request #12126 from owncloud/remove-debug-statement | Lukas Reschke | 2014-11-12 | 1 | -4/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Remove debug statement | Lukas Reschke | 2014-11-12 | 1 | -4/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #12110 from owncloud/fix-12080 | Thomas Müller | 2014-11-12 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | add 'namespace' for automatically created navigation divs, fixes #12080 | Arthur Schiwon | 2014-11-12 | 2 | -2/+2 |
* | | | | | | Merge pull request #12093 from AdamWill/storage-test-touch | Morris Jobke | 2014-11-12 | 1 | -3/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | storage test: use new file for testTouchCreateFile() | Adam Williamson | 2014-11-10 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #12105 from owncloud/dav-fixcleanpath | Thomas Müller | 2014-11-12 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix root path handling for WebDAV ext storage | Vincent Petry | 2014-11-11 | 1 | -0/+2 |
* | | | | | | Merge pull request #12107 from owncloud/dav-propfindmimetype | Thomas Müller | 2014-11-12 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Return real mime type on PROPFIND | Vincent Petry | 2014-11-11 | 1 | -0/+4 |
| |/ / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-12 | 22 | -10/+60 |
* | | | | | | Merge pull request #12114 from owncloud/fix-pimple | Morris Jobke | 2014-11-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix Pimple unset | Bernhard Posselt | 2014-11-11 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #11917 from owncloud/fix-11909 | Thomas Müller | 2014-11-11 | 10 | -36/+311 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Migrate "setsecurity.php" to the AppFramework | Lukas Reschke | 2014-11-03 | 10 | -36/+311 |
* | | | | | | Merge pull request #11929 from owncloud/fix-db-center | Jan-Christoph Borchardt | 2014-11-11 | 1 | -0/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fixes not centered database chooser on setup page | Morris Jobke | 2014-11-03 | 1 | -0/+14 |