summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable7' of https://github.com/owncloud/core into stable7v7.0.1RC1Frank Karlitschek2014-07-3065-200/+1308
|\
| * set max width for notifications so they won't overlap the whole headerJan-Christoph Borchardt2014-07-301-0/+1
| * fix yellow notification styleJan-Christoph Borchardt2014-07-302-5/+12
| * fix notification preventing top bar clickability, fix #9680Jan-Christoph Borchardt2014-07-301-1/+7
| * don't preload videos on public sharing, fixes #10042Georg Ehrke2014-07-301-1/+1
| * extract transparency fix from #8050Georg Ehrke2014-07-301-0/+8
| * Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-303-10/+8
| * make sure that we always find all versionsBjoern Schiessle2014-07-301-22/+37
| * add unit test for rename and copy operationBjoern Schiessle2014-07-304-7/+171
| * make the versions and encryption app aware of the copy operationBjoern Schiessle2014-07-305-14/+65
| * Merge pull request #9902 from Der-Jan/stable7Jan-Christoph Borchardt2014-07-301-1/+1
| |\
| | * Fixed wrong brackets in apps settingsDer-Jan2014-07-251-1/+1
| * | add unit testBjoern Schiessle2014-07-301-0/+26
| * | make sure that we set the expire date if a date is adefault date is setBjoern Schiessle2014-07-301-1/+2
| * | also use link icon for the folders ..Jan-Christoph Borchardt2014-07-302-19/+22
| * | migration test for sqlite - adding type mapping for 'tinyint unsigned'Thomas Müller2014-07-303-1/+53
| * | Fix template rendering for 'blank' templatesMorris Jobke2014-07-301-1/+3
| * | only call exec() if allowed toThomas Müller2014-07-291-3/+5
| * | use more understandable 'link' icon for public links (instead of hard to reco...Jan-Christoph Borchardt2014-07-292-2/+5
| * | max icon size for app menuMichael Göhler2014-07-291-0/+2
| * | define type in pre hookBjoern Schiessle2014-07-291-4/+7
| * | show a warning in the personal settings and admin settins if the encyption ke...Bjoern Schiessle2014-07-293-3/+13
| * | remove share permission if user is excluded from sharingBjoern Schiessle2014-07-292-1/+34
| * | update attributes for share with user list, file should always have delete pe...Bjoern Schiessle2014-07-291-0/+3
| * | Merge pull request #9990 from owncloud/fix-failing-unit-test-stable7Thomas Müller2014-07-291-5/+5
| |\ \
| | * | function declaration did not matchThomas Müller2014-07-291-4/+4
| | * | function declaration did not matchThomas Müller2014-07-281-1/+1
| * | | Merge pull request #9946 from owncloud/remove-mssql-bundle-stable7Thomas Müller2014-07-281-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | remove MssqlBundleThomas Müller2014-07-281-0/+0
| |/ /
| * | Fix enforced share expiration date to be based on share timeVincent Petry2014-07-284-15/+170
| * | adjust error codeBjoern Schiessle2014-07-281-2/+2
| * | add OCS api call to set expire date for link sharesBjoern Schiessle2014-07-288-33/+224
| * | Merge pull request #9948 from owncloud/backport-9904-stable7Thomas Müller2014-07-281-1/+5
| |\ \
| | * | Dont throw an error when calling $server->getUserFolder when logged outRobin Appelman2014-07-281-1/+5
| | |/
| * | generate copy of sqlite database file in data directoryThomas Müller2014-07-282-2/+27
| * | ownCloud users are exported as address bookThomas Müller2014-07-283-0/+208
| * | enable input grouping also outside of log in screenJan-Christoph Borchardt2014-07-281-3/+6
| * | update getID3 library & add autoloadMorris Jobke2014-07-282-2/+0
| * | Dont try to execute jobs that no longer existRobin Appelman2014-07-281-1/+4
| * | improve look of search on mobile, save space in top barJan-Christoph Borchardt2014-07-284-5/+19
| * | Set version AFTER a successful updateVincent Petry2014-07-281-2/+3
| * | Verify whether the URL is validLukas Reschke2014-07-281-0/+5
| |/
| * Merge pull request #9892 from owncloud/fix_sharing_update_oc7Björn Schießle2014-07-252-2/+5
| |\
| | * fix sharing update, add proper escapingBjoern Schiessle2014-07-252-2/+5
| |/
| * Fix preview animation on uploadingVincent Petry2014-07-252-3/+4
| * - adding default value for $recoveryPasswordThomas Müller2014-07-243-5/+28
| * register type mappings for unknown/unsupported mysql typesThomas Müller2014-07-241-0/+4
| * Adding test which breaks because bit and/or enum datatypes are usedThomas Müller2014-07-241-0/+39
| * Prevent cron.php to trigger apps updatingVincent Petry2014-07-231-0/+5
| * only commit in case a transaction is activeThomas Müller2014-07-231-1/+3