summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #24062 from owncloud/fix-gitignoreThomas Müller2016-04-195-80/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unneeded filesMorris Jobke2016-04-184-79/+0
| * | | | | | | | | Fix gitignore for core/vendorMorris Jobke2016-04-181-1/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #24079 from owncloud/console_psr4Thomas Müller2016-04-192-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move \OC\Console to PSR-4Roeland Jago Douma2016-04-192-0/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-userThomas Müller2016-04-197-5/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-157-5/+57
* | | | | | | | | | Merge pull request #24076 from owncloud/fix-initial-calendar-and-addressbook-...Lukas Reschke2016-04-192-18/+89
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix displayname for initial calendars and address books - fixes #24057Thomas Müller2016-04-182-18/+89
* | | | | | | | | | | Merge pull request #24054 from owncloud/data_fingerprintRoeland Douma2016-04-199-12/+232
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add config textRoeland Jago Douma2016-04-181-0/+13
| * | | | | | | | | | Add occ command for updating the data-fingerprintRoeland Jago Douma2016-04-183-0/+118
| * | | | | | | | | | Add data-fingerprint property to webdavRoeland Jago Douma2016-04-185-12/+101
* | | | | | | | | | | Merge pull request #23993 from owncloud/update-to-jquery2Thomas Müller2016-04-1915-5257/+4887
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Turn off jQuery animations when testingChristoph Wurst2016-04-181-0/+2
| * | | | | | | | | | | downgrade jquery, update jquery-migrateChristoph Wurst2016-04-1511-3081/+2675
| * | | | | | | | | | | add jquery files to gitChristoph Wurst2016-04-144-1/+9848
| * | | | | | | | | | | update jquery to version 2.2.3Christoph Wurst2016-04-147-9830/+17
* | | | | | | | | | | | Merge pull request #24074 from owncloud/integritycheck_psr4Thomas Müller2016-04-197-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix use statementRoeland Jago Douma2016-04-181-1/+1
| * | | | | | | | | | | Move OC\IntegrityCheck to PSR-4Roeland Jago Douma2016-04-187-0/+0
* | | | | | | | | | | | Merge pull request #23903 from owncloud/fix-user-data-folder-creation-for-apa...Thomas Müller2016-04-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes #23899Thomas Müller2016-04-111-0/+4
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1994-96/+44
* | | | | | | | | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hookThomas Müller2016-04-1910-204/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move post_removeFromGroup to shareManagerRoeland Jago Douma2016-04-1310-204/+142
* | | | | | | | | | | | | | Merge pull request #24049 from owncloud/skjnldsv-fix-colors-valuesThomas Müller2016-04-191-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix rgb valuesJohn Molakvoæ2016-04-181-1/+7
* | | | | | | | | | | | | | | Merge pull request #24056 from owncloud/move-logout-to-logincontrollerThomas Müller2016-04-1910-38/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move logout to controllerLukas Reschke2016-04-1810-38/+95
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Revert "Fix displayname for initial calendars and address books - fixes #24057"Thomas Müller2016-04-182-89/+18
* | | | | | | | | | | | | | Fix displayname for initial calendars and address books - fixes #24057Thomas Müller2016-04-182-18/+89
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #24037 from owncloud/file_versions_defaultLukas Reschke2016-04-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | link to file_versioning.rstCarla Schroder2016-04-151-3/+3
* | | | | | | | | | | | | | Merge pull request #23911 from owncloud/split-upgrade-commandChristoph Wurst2016-04-1810-319/+434
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |