| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5120 from frisco82/sendEmailJS | Vincent Petry | 2013-10-21 | 1 | -4/+4 |
| |\ | | | | | Fix disabled status after sending a share link email | ||||
| | * | Fix disabled status after sending the email | Ramiro Aparicio | 2013-10-04 | 1 | -4/+4 |
| | | | |||||
| * | | Merge pull request #5444 from frisco82/fixDisplayGroup | Vincent Petry | 2013-10-21 | 2 | -8/+11 |
| |\ \ | | | | | | | Fix display name for user after sharing | ||||
| | * | | fix user displayName not being shown after add, added class for improved ↵ | Ramiro Aparicio | 2013-10-21 | 2 | -8/+11 |
| | | | | | | | | | | | | | styling, fix strong for groups when english is not being used | ||||
| * | | | Merge pull request #5452 from owncloud/fixing-4548-master | Frank Karlitschek | 2013-10-21 | 2 | -3/+19 |
| |\ \ \ | | | | | | | | | OCS API to get current user information | ||||
| | * | | | New OCS route: | Thomas Müller | 2013-10-21 | 2 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /ocs/cloud/user Response: <?xml version="1.0"?> <ocs> <meta> <status>ok</status> <statuscode>100</statuscode> <message/> </meta> <data> <id>thomas</id> <display-name>DeepDiver</display-name> <email>no-response@domain.tld</email> </data> </ocs> | ||||
| * | | | | Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix | Vincent Petry | 2013-10-21 | 3 | -12/+4 |
| |\ \ \ \ | |/ / / |/| | | | Fixed share with link checkbox missing as regular user | ||||
| | * | | | Fixed share with link checkbox missing as regular user | Vincent Petry | 2013-10-21 | 3 | -12/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440 | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-21 | 215 | -1193/+1486 |
| | | | | | |||||
| * | | | | Merge pull request #5424 from owncloud/sharing-directlink | Vincent Petry | 2013-10-21 | 3 | -0/+14 |
| |\ \ \ \ | |_|/ / |/| | | | Added direct link in public share page | ||||
| | * | | | unbold the 'Direct link' label | Jan-Christoph Borchardt | 2013-10-21 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | reduce width of direct link input field | Jan-Christoph Borchardt | 2013-10-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added direct link in public share page | Vincent Petry | 2013-10-18 | 3 | -0/+11 |
| | | | | | | | | | | | | | | | | | Fixes #1167 | ||||
| * | | | | Merge pull request #5434 from owncloud/fix5209 | blizzz | 2013-10-21 | 2 | -1/+19 |
| |\ \ \ \ | |_|/ / |/| | | | dispayNamesInGroup(s) should always return uid as key in the result array, fixes #5209 | ||||
| | * | | | Test that dispayNamesInGroup(s) always returns uid as key in the result array | Arthur Schiwon | 2013-10-20 | 1 | -0/+18 |
| | | | | | |||||
| | * | | | dispayNamesInGroup(s) should always return uid as key in the result attr, ↵ | Arthur Schiwon | 2013-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | fixes #5209 | ||||
| * | | | | Merge pull request #5200 from owncloud/ie8-warning-fix | Frank Karlitschek | 2013-10-20 | 1 | -0/+5 |
| |\ \ \ \ | | | | | | | | | | | Fix warning box in IE8 | ||||
| | * | | | | Fix warning box in IE8 | Morris Jobke | 2013-10-16 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | * simulates a black transparent background on a blue pane | ||||
| * | | | | | Merge pull request #5433 from owncloud/inputs-seem-disabled | Jan-Christoph Borchardt | 2013-10-20 | 1 | -2/+4 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | input field background size to white, fix input fields seeming disabled,... | ||||
| | * | | | | remove superfluous input hover color change | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | input field background size to white, fix input fields seeming disabled, fix ↵ | Jan-Christoph Borchardt | 2013-10-20 | 1 | -1/+3 |
| |/ / / / | | | | | | | | | | | | | #5168 | ||||
| * | | | | Merge pull request #5429 from owncloud/fix_cron_docu | Frank Karlitschek | 2013-10-20 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | harmonize this with the documentation. Once every minute is way to often. | ||||
| | * | | | | change the language | Frank Karlitschek | 2013-10-20 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | harmonize this with the documentation. Once every minute is way to often. ↵ | Frank Karlitschek | 2013-10-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-20 | 12 | -12/+12 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-19 | 61 | -514/+3716 |
| |/ / / / | |||||
| * | | | | LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to ↵ | Arthur Schiwon | 2013-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | @sfyang | ||||
| * | | | | Merge pull request #5422 from owncloud/fix_logfile_permissions | Frank Karlitschek | 2013-10-18 | 1 | -0/+1 |
| |\ \ \ \ | |_|/ / |/| | | | the logfile shoudn't be world readable. | ||||
| | * | | | the logfile shoudn't be world readable. | Frank Karlitschek | 2013-10-18 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #5338 from frisco82/fixGroupDisplay | Morris Jobke | 2013-10-18 | 1 | -1/+4 |
| |\ \ \ | | | | | | | | | Show (group) after groups in share dropdown | ||||
| | * | | | Show (group) after groups in share dropdown | Ramiro Aparicio | 2013-10-14 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Merge pull request #5403 from owncloud/fix-breadcrumbs | Jan-Christoph Borchardt | 2013-10-18 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | correctly position ... overflow in breadcrumbs, fix #5158 | ||||
| | * | | | | correctly position ... overflow in breadcrumbs, fix #5158 | Jan-Christoph Borchardt | 2013-10-17 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #5321 from owncloud/settings-applistwidths | Vincent Petry | 2013-10-18 | 1 | -1/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixed app list right container to not overlap left container scrollbar | ||||
| | * | | | | | Fixed app list right container to not overlap left container scrollbar | Vincent Petry | 2013-10-14 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Container widths in apps list now use pixels instead of em - Container widths now match properly and rightcontainer doesn't overlap the scrollbar any more | ||||
| * | | | | | | Merge pull request #3219 from owncloud/disabled-links-ui | Frank Karlitschek | 2013-10-18 | 5 | -1/+81 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Disabled links UI fixes | ||||
| | * | | | | | | Remove "link" shares right after disabling the "allow_link_share" setting | Morris Jobke | 2013-10-18 | 4 | -0/+64 |
| | | | | | | | | |||||
| | * | | | | | | readability: single line -> multiple lines | Morris Jobke | 2013-10-18 | 1 | -4/+10 |
| | | | | | | | | |||||
| | * | | | | | | Fix accidental deletion of if | Michael Gapczynski | 2013-10-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Don't show links option in dropdown if disabled | Michael Gapczynski | 2013-10-18 | 1 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | Don't return links for shared files if disabled | Michael Gapczynski | 2013-10-18 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Use display name from magic cookie, fixes #4884 | Arthur Schiwon | 2013-10-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #5412 from owncloud/fix_5141 | Björn Schießle | 2013-10-18 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | give getSelectedFilesTrash() a unique name for the trash.js | ||||
| | * | | | | | | | give getSelectedFilesTrash() a unique name for the trash.js to avoid ↵ | Bjoern Schiessle | 2013-10-18 | 1 | -5/+5 |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | confusions with the same function in files.js | ||||
| * | | | | | | | Merge pull request #5411 from owncloud/ocs_share_api_cleanup | Vincent Petry | 2013-10-18 | 1 | -13/+4 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | filter duplicates directly in the sql query | ||||
| | * | | | | | | filter duplicates directly in the sql query | Bjoern Schiessle | 2013-10-18 | 1 | -13/+4 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #5405 from owncloud/sharing-chromehangswithversionenabled | Morris Jobke | 2013-10-18 | 1 | -0/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Disable versions app JS in public mode | ||||
| | * | | | | | | Disable versions app JS in public mode | Vincent Petry | 2013-10-17 | 1 | -0/+7 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the version JS code isn't used in public link mode, disable it to prevent Chrome freezing bugs due to the t() call being synchronous. Fixes #4545 | ||||
| * | | | | | | Merge pull request #5395 from owncloud/more_check_options | Vincent Petry | 2013-10-18 | 2 | -0/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add options to disable the check for a working .htaccess file in data | ||||
| | * | | | | | | add options to disable the check for a working .htaccess file in data and ↵ | Frank Karlitschek | 2013-10-17 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout. | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |