summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixing-5222-masterThomas Müller2013-10-222-12/+11
|\
| * Merge pull request #5446 from frisco82/fixNotifyUserFrank Karlitschek2013-10-212-12/+11
| |\
| | * fix notify user, and made js more resiliant to changesRamiro Aparicio2013-10-212-12/+11
* | | php 5.3 compatibility regarding OC\DB\Connection fixedThomas Müller2013-10-213-2/+96
|/ /
* | Merge pull request #5249 from owncloud/activities-apiThomas Müller2013-10-216-0/+184
|\ \
| * \ Merge branch 'master' into activities-apiThomas Müller2013-10-1626-476/+233
| |\ \
| * | | remove test codeThomas Müller2013-10-161-4/+0
| * | | Merge branch 'master' into activities-apiThomas Müller2013-10-16990-21642/+19802
| |\ \ \
| * | | | adding OC6 public API for activitiesThomas Müller2013-10-093-5/+44
| * | | | Merge branch 'master' into activities-apiThomas Müller2013-10-091177-19806/+34007
| |\ \ \ \
| * | | | | initial implementation of activity managerThomas Müller2013-09-294-0/+73
| * | | | | Merge branch 'appframework-master' into activities-apiThomas Müller2013-09-29689-9922/+23573
| |\ \ \ \ \
| * | | | | | adding basic interfaces for the activities apiThomas Müller2013-09-203-0/+77
* | | | | | | Merge pull request #5120 from frisco82/sendEmailJSVincent Petry2013-10-211-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix disabled status after sending the emailRamiro Aparicio2013-10-041-4/+4
* | | | | | | | Merge pull request #5444 from frisco82/fixDisplayGroupVincent Petry2013-10-212-8/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | fix user displayName not being shown after add, added class for improved styl...Ramiro Aparicio2013-10-212-8/+11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #5452 from owncloud/fixing-4548-masterFrank Karlitschek2013-10-212-3/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | New OCS route:Thomas Müller2013-10-212-3/+19
* | | | | | | | | Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfixVincent Petry2013-10-213-12/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed share with link checkbox missing as regular userVincent Petry2013-10-213-12/+4
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-21215-1193/+1486
* | | | | | | | | Merge pull request #5424 from owncloud/sharing-directlinkVincent Petry2013-10-213-0/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | unbold the 'Direct link' labelJan-Christoph Borchardt2013-10-211-1/+4
| * | | | | | | | reduce width of direct link input fieldJan-Christoph Borchardt2013-10-211-1/+1
| * | | | | | | | Added direct link in public share pageVincent Petry2013-10-183-0/+11
* | | | | | | | | Merge pull request #5434 from owncloud/fix5209blizzz2013-10-212-1/+19
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Test that dispayNamesInGroup(s) always returns uid as key in the result arrayArthur Schiwon2013-10-201-0/+18
| * | | | | | | | dispayNamesInGroup(s) should always return uid as key in the result attr, fix...Arthur Schiwon2013-10-201-1/+1
* | | | | | | | | Merge pull request #5200 from owncloud/ie8-warning-fixFrank Karlitschek2013-10-201-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix warning box in IE8Morris Jobke2013-10-161-0/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #5433 from owncloud/inputs-seem-disabledJan-Christoph Borchardt2013-10-201-2/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | remove superfluous input hover color changeJan-Christoph Borchardt2013-10-201-1/+1
| * | | | | | | | input field background size to white, fix input fields seeming disabled, fix ...Jan-Christoph Borchardt2013-10-201-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #5429 from owncloud/fix_cron_docuFrank Karlitschek2013-10-201-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | change the languageFrank Karlitschek2013-10-201-2/+2
| * | | | | | | | harmonize this with the documentation. Once every minute is way to often. Eve...Frank Karlitschek2013-10-191-2/+2
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2012-12/+12
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1961-514/+3716
|/ / / / / / / /
* | | | | | | | LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @...Arthur Schiwon2013-10-191-1/+1
* | | | | | | | Merge pull request #5422 from owncloud/fix_logfile_permissionsFrank Karlitschek2013-10-181-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | the logfile shoudn't be world readable.Frank Karlitschek2013-10-181-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #5338 from frisco82/fixGroupDisplayMorris Jobke2013-10-181-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Show (group) after groups in share dropdownRamiro Aparicio2013-10-141-1/+4
* | | | | | | | Merge pull request #5403 from owncloud/fix-breadcrumbsJan-Christoph Borchardt2013-10-181-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | correctly position ... overflow in breadcrumbs, fix #5158Jan-Christoph Borchardt2013-10-171-1/+2
* | | | | | | | | Merge pull request #5321 from owncloud/settings-applistwidthsVincent Petry2013-10-181-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed app list right container to not overlap left container scrollbarVincent Petry2013-10-141-1/+5
* | | | | | | | | | Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-185-1/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-184-0/+64
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 19:28:39 +0000