Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added script to build the JS documentation | Vincent Petry | 2014-10-31 | 2 | -0/+43 |
* | Merge pull request #11876 from owncloud/remove-pointless-requires | Lukas Reschke | 2014-10-31 | 33 | -128/+57 |
|\ | |||||
| * | remove unnecessary require calls - the ownCloud class loader is supposed to t... | Thomas Müller | 2014-10-30 | 33 | -128/+57 |
* | | Merge pull request #11539 from owncloud/mount-setup-once | Vincent Petry | 2014-10-31 | 1 | -1/+6 |
|\ \ | |||||
| * | | Reset the users setup after clearing mounts | Robin Appelman | 2014-10-28 | 1 | -0/+1 |
| * | | Only mount the storages for the user once | Robin Appelman | 2014-10-27 | 1 | -1/+5 |
* | | | Merge pull request #11850 from owncloud/fix-11848 | Vincent Petry | 2014-10-31 | 2 | -14/+10 |
|\ \ \ | |||||
| * | | | on xp'ed mode and switching configurations: save raw mode instead of toggling... | Arthur Schiwon | 2014-10-29 | 2 | -14/+10 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-31 | 158 | -858/+1000 |
* | | | | Merge pull request #11877 from owncloud/fix-11875-master | Morris Jobke | 2014-10-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | prevent PHP notice | Thomas Müller | 2014-10-30 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #11080 from owncloud/addheader-text-2 | Vincent Petry | 2014-10-30 | 6 | -39/+31 |
|\ \ \ \ | |||||
| * | | | | Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text... | Lukas Reschke | 2014-10-28 | 6 | -39/+31 |
* | | | | | Merge pull request #11659 from jknockaert/master | Vincent Petry | 2014-10-30 | 1 | -38/+54 |
|\ \ \ \ \ | |||||
| * | | | | | initialisation of cipher | jknockaert | 2014-10-28 | 1 | -1/+1 |
| * | | | | | small fix | jknockaert | 2014-10-20 | 1 | -0/+1 |
| * | | | | | bugfixes | jknockaert | 2014-10-20 | 1 | -5/+6 |
| * | | | | | ok; still some bugs that had to be fixed | jknockaert | 2014-10-20 | 1 | -39/+35 |
| * | | | | | small fix | jknockaert | 2014-10-19 | 1 | -1/+2 |
| * | | | | | rework getFileSize | jknockaert | 2014-10-19 | 1 | -28/+45 |
* | | | | | | Merge pull request #11740 from owncloud/update-archive-tar | Thomas Müller | 2014-10-30 | 2 | -2/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update pear/archive_tar to 1.3.13 | Thomas Müller | 2014-10-30 | 2 | -2/+0 |
* | | | | | | | Merge pull request #11867 from owncloud/settings-sidebar-admin | Jan-Christoph Borchardt | 2014-10-30 | 5 | -111/+169 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | admin settings: fix LDAP settings header layout | Jan-Christoph Borchardt | 2014-10-30 | 1 | -2/+3 |
| * | | | | | | | fix loading of more log entries | Thomas Müller | 2014-10-30 | 4 | -37/+39 |
| * | | | | | | | fixing ldap listing in admin sidebar - needs styling review | Thomas Müller | 2014-10-30 | 1 | -2/+3 |
| * | | | | | | | introduce sidebar for admin page | Thomas Müller | 2014-10-30 | 2 | -74/+128 |
* | | | | | | | | Merge pull request #11864 from owncloud/clear-session-after-logout | Lukas Reschke | 2014-10-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Clear session after logout | Lukas Reschke | 2014-10-30 | 1 | -0/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #11858 from owncloud/fix-11064 | Morris Jobke | 2014-10-30 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Allow any outgoing XHR connections | Lukas Reschke | 2014-10-30 | 2 | -2/+3 |
* | | | | | | | Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro | Thomas Müller | 2014-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix stupid copy paste fail | Lukas Reschke | 2014-10-30 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #11821 from owncloud/generic-response | Morris Jobke | 2014-10-30 | 8 | -29/+292 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add dataresponse | Bernhard Posselt | 2014-10-29 | 8 | -29/+292 |
* | | | | | | | | Merge pull request #11863 from owncloud/fix-enc-sharingtests | Morris Jobke | 2014-10-30 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Properly register sharing hooks and proxies | Vincent Petry | 2014-10-30 | 1 | -1/+7 |
| | |/ / / / / / | |/| | | | | | | |||||
* / | | | | | | | update 3rdparty to match it's master branch | Morris Jobke | 2014-10-30 | 1 | -0/+0 |
|/ / / / / / / | |||||
* | / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-30 | 366 | -780/+1561 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | fix style of generated documentation | Morris Jobke | 2014-10-29 | 1 | -1/+2 |
* | | | | | | Merge pull request #11409 from owncloud/watcher-reuse | Vincent Petry | 2014-10-29 | 5 | -43/+53 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Better reuse of cache data for getFolderContents | Robin Appelman | 2014-10-24 | 2 | -8/+14 |
| * | | | | | | Fix shared cache getFolderContents | Robin Appelman | 2014-10-24 | 1 | -17/+14 |
| * | | | | | | also update shared watcher | Robin Appelman | 2014-10-24 | 1 | -2/+4 |
| * | | | | | | Pass the cached data to the filesystem watcher | Robin Appelman | 2014-10-24 | 2 | -16/+21 |
* | | | | | | | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder | Morris Jobke | 2014-10-29 | 3 | -35/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added encryption test when moving file as non-owner | Vincent Petry | 2014-10-29 | 1 | -2/+15 |
| * | | | | | | | Fix warning with unset extension check | Vincent Petry | 2014-10-29 | 1 | -1/+1 |
| * | | | | | | | Fix moving share keys as non-owner to subdir | Vincent Petry | 2014-10-29 | 1 | -32/+26 |
* | | | | | | | | Merge pull request #11831 from owncloud/make-search-non-blocking | Lukas Reschke | 2014-10-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ |