aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23990 from owncloud/heartbeat-debounceMorris Jobke2016-04-202-4/+12
|\
| * Debounce heartbeat ajax calls to lower the number of requestsChristoph Wurst2016-04-182-4/+12
* | Merge pull request #23951 from owncloud/cleanlocks-chunkThomas Müller2016-04-201-7/+18
|\ \
| * | Let the querybuilder convertRoeland Jago Douma2016-04-141-4/+2
| * | chunk the cleaning up of shared locksRobin Appelman2016-04-141-7/+20
* | | Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functionsThomas Müller2016-04-2016-238/+30
|\ \ \
| * | | replace $().attr('checked') by $().prop('checked', state) or $().is(':checked')Christoph Wurst2016-04-197-15/+15
| * | | replace $.parseJSON() by JSON.parse()Christoph Wurst2016-04-1911-220/+8
| * | | migrate jQuery.fn.unload()Christoph Wurst2016-04-191-1/+1
| * | | remove deprecated jQuery.browserChristoph Wurst2016-04-191-4/+8
* | | | Merge pull request #24064 from owncloud/update-3rdpartyThomas Müller2016-04-201-0/+0
|\ \ \ \
| * | | | Update 3rdparty to remove unneeded filesMorris Jobke2016-04-201-0/+0
* | | | | Merge pull request #23919 from owncloud/cyclyc-share-dep-exampleThomas Müller2016-04-2037-1244/+1083
|\ \ \ \ \
| * | | | | Move moveFromCache to CacheJailRoeland Jago Douma2016-04-192-4/+16
| * | | | | Move copy- and moveFromStorage to jailRoeland Jago Douma2016-04-192-20/+26
| * | | | | Only construct the storage when we start using itRobin Appelman2016-04-196-23/+116
| * | | | | Fix resolve pathRoeland Jago Douma2016-04-193-15/+8
| * | | | | Fix testsRoeland Jago Douma2016-04-1918-723/+738
| * | | | | Fix related logicRoeland Jago Douma2016-04-195-24/+48
| * | | | | Move SharedStorage et al over to the shareManager and jailRoeland Jago Douma2016-04-198-456/+146
| * | | | | cache the scanner/updater/cache in the wrapper storageRobin Appelman2016-04-192-12/+18
| | |/ / / | |/| | |
* | | | | Merge pull request #24098 from owncloud/fix_23782Thomas Müller2016-04-202-0/+22
|\ \ \ \ \
| * | | | | When the scanner detects a file is changed clear checksumRoeland Jago Douma2016-04-192-0/+22
| |/ / / /
* | | | | Merge pull request #24118 from owncloud/add-load-script-events-for-settingsThomas Müller2016-04-202-0/+4
|\ \ \ \ \
| * | | | | Add loadAdditionalScripts events to admin and personal for plugins that have ...Joas Schilling2016-04-202-0/+4
* | | | | | Merge pull request #24123 from owncloud/preview_psr4Thomas Müller2016-04-2025-0/+0
|\ \ \ \ \ \
| * | | | | | Move \OC\Preview to PSR-4Roeland Jago Douma2016-04-2025-0/+0
|/ / / / / /
* | | | | | Merge pull request #24075 from owncloud/no-html-on-cliLukas Reschke2016-04-203-11/+14
|\ \ \ \ \ \
| * | | | | | In case of fatal php errors and other unhandled exceptions no html error page...Thomas Müller2016-04-183-11/+14
* | | | | | | Merge pull request #24116 from owncloud/fix_24095Thomas Müller2016-04-201-3/+4
|\ \ \ \ \ \ \
| * | | | | | | preserve information if it is a rename operation or notBjörn Schießle2016-04-201-3/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23760 from owncloud/fix-setup-mysqlThomas Müller2016-04-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix conditional check in MySQL setupRobin McCorkell2016-04-201-1/+1
* | | | | | | | Merge pull request #24120 from owncloud/mail_psr4Thomas Müller2016-04-202-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Move \OC\Mail to PSR-4Roeland Jago Douma2016-04-202-0/+0
|/ / / / / / /
* | | | | | | Merge pull request #23952 from owncloud/hide-hidden-filesThomas Müller2016-04-2013-13/+155
|\ \ \ \ \ \ \
| * | | | | | | filter hidden files on the web interfaceChristoph Wurst2016-04-1913-13/+155
* | | | | | | | Merge pull request #24094 from owncloud/move_dummy_group_backend_to_testThomas Müller2016-04-206-13/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Move the group dummy backend to testRoeland Jago Douma2016-04-196-13/+17
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #24097 from owncloud/fix_23632Thomas Müller2016-04-202-10/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
* | | | | | | | | Merge pull request #24104 from tyrylu/accessibility_settings_fixThomas Müller2016-04-201-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix reporting of the categories in app settings as links by screen readers.Lukáš Tyrychtr2016-04-191-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #24103 from owncloud/diagnostics_psr4Thomas Müller2016-04-206-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move \OC\Diagnostics to PSR-4Roeland Jago Douma2016-04-196-0/+0
| |/ / / / / / / /
* | | | | | | | | Merge pull request #23980 from owncloud/remember-email-when-setting-expiratio...Jan-Christoph Borchardt2016-04-205-70/+187
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | extract mail view for sending share invitationsChristoph Wurst2016-04-195-70/+187
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #23915 from owncloud/activity-505-always-stream-for-commentsBjörn Schießle2016-04-201-2/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Always add activities for comments to the streamJoas Schilling2016-04-111-2/+9
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2016-8/+60
| |_|/ / / / / / |/| | | | | | |