Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23990 from owncloud/heartbeat-debounce | Morris Jobke | 2016-04-20 | 2 | -4/+12 |
|\ | |||||
| * | Debounce heartbeat ajax calls to lower the number of requests | Christoph Wurst | 2016-04-18 | 2 | -4/+12 |
* | | Merge pull request #23951 from owncloud/cleanlocks-chunk | Thomas Müller | 2016-04-20 | 1 | -7/+18 |
|\ \ | |||||
| * | | Let the querybuilder convert | Roeland Jago Douma | 2016-04-14 | 1 | -4/+2 |
| * | | chunk the cleaning up of shared locks | Robin Appelman | 2016-04-14 | 1 | -7/+20 |
* | | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions | Thomas Müller | 2016-04-20 | 16 | -238/+30 |
|\ \ \ | |||||
| * | | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') | Christoph Wurst | 2016-04-19 | 7 | -15/+15 |
| * | | | replace $.parseJSON() by JSON.parse() | Christoph Wurst | 2016-04-19 | 11 | -220/+8 |
| * | | | migrate jQuery.fn.unload() | Christoph Wurst | 2016-04-19 | 1 | -1/+1 |
| * | | | remove deprecated jQuery.browser | Christoph Wurst | 2016-04-19 | 1 | -4/+8 |
* | | | | Merge pull request #24064 from owncloud/update-3rdparty | Thomas Müller | 2016-04-20 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Update 3rdparty to remove unneeded files | Morris Jobke | 2016-04-20 | 1 | -0/+0 |
* | | | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-example | Thomas Müller | 2016-04-20 | 37 | -1244/+1083 |
|\ \ \ \ \ | |||||
| * | | | | | Move moveFromCache to CacheJail | Roeland Jago Douma | 2016-04-19 | 2 | -4/+16 |
| * | | | | | Move copy- and moveFromStorage to jail | Roeland Jago Douma | 2016-04-19 | 2 | -20/+26 |
| * | | | | | Only construct the storage when we start using it | Robin Appelman | 2016-04-19 | 6 | -23/+116 |
| * | | | | | Fix resolve path | Roeland Jago Douma | 2016-04-19 | 3 | -15/+8 |
| * | | | | | Fix tests | Roeland Jago Douma | 2016-04-19 | 18 | -723/+738 |
| * | | | | | Fix related logic | Roeland Jago Douma | 2016-04-19 | 5 | -24/+48 |
| * | | | | | Move SharedStorage et al over to the shareManager and jail | Roeland Jago Douma | 2016-04-19 | 8 | -456/+146 |
| * | | | | | cache the scanner/updater/cache in the wrapper storage | Robin Appelman | 2016-04-19 | 2 | -12/+18 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #24098 from owncloud/fix_23782 | Thomas Müller | 2016-04-20 | 2 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | When the scanner detects a file is changed clear checksum | Roeland Jago Douma | 2016-04-19 | 2 | -0/+22 |
| |/ / / / | |||||
* | | | | | Merge pull request #24118 from owncloud/add-load-script-events-for-settings | Thomas Müller | 2016-04-20 | 2 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Add loadAdditionalScripts events to admin and personal for plugins that have ... | Joas Schilling | 2016-04-20 | 2 | -0/+4 |
* | | | | | | Merge pull request #24123 from owncloud/preview_psr4 | Thomas Müller | 2016-04-20 | 25 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move \OC\Preview to PSR-4 | Roeland Jago Douma | 2016-04-20 | 25 | -0/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #24075 from owncloud/no-html-on-cli | Lukas Reschke | 2016-04-20 | 3 | -11/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | In case of fatal php errors and other unhandled exceptions no html error page... | Thomas Müller | 2016-04-18 | 3 | -11/+14 |
* | | | | | | | Merge pull request #24116 from owncloud/fix_24095 | Thomas Müller | 2016-04-20 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | preserve information if it is a rename operation or not | Björn Schießle | 2016-04-20 | 1 | -3/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #23760 from owncloud/fix-setup-mysql | Thomas Müller | 2016-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix conditional check in MySQL setup | Robin McCorkell | 2016-04-20 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #24120 from owncloud/mail_psr4 | Thomas Müller | 2016-04-20 | 2 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Move \OC\Mail to PSR-4 | Roeland Jago Douma | 2016-04-20 | 2 | -0/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #23952 from owncloud/hide-hidden-files | Thomas Müller | 2016-04-20 | 13 | -13/+155 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | filter hidden files on the web interface | Christoph Wurst | 2016-04-19 | 13 | -13/+155 |
* | | | | | | | | Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test | Thomas Müller | 2016-04-20 | 6 | -13/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move the group dummy backend to test | Roeland Jago Douma | 2016-04-19 | 6 | -13/+17 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #24097 from owncloud/fix_23632 | Thomas Müller | 2016-04-20 | 2 | -10/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | we need to initialize the mount points of the given user before we recover | Björn Schießle | 2016-04-19 | 2 | -10/+48 |
* | | | | | | | | | Merge pull request #24104 from tyrylu/accessibility_settings_fix | Thomas Müller | 2016-04-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix reporting of the categories in app settings as links by screen readers. | Lukáš Tyrychtr | 2016-04-19 | 1 | -3/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #24103 from owncloud/diagnostics_psr4 | Thomas Müller | 2016-04-20 | 6 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move \OC\Diagnostics to PSR-4 | Roeland Jago Douma | 2016-04-19 | 6 | -0/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #23980 from owncloud/remember-email-when-setting-expiratio... | Jan-Christoph Borchardt | 2016-04-20 | 5 | -70/+187 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | extract mail view for sending share invitations | Christoph Wurst | 2016-04-19 | 5 | -70/+187 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments | Björn Schießle | 2016-04-20 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Always add activities for comments to the stream | Joas Schilling | 2016-04-11 | 1 | -2/+9 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-20 | 16 | -8/+60 |
| |_|/ / / / / / |/| | | | | | | |