Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #5473 from owncloud/files-startviewerfunc | Thomas Müller | 2013-10-22 | 1 | -0/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Added FileList.setViewerMode to hide controls | Vincent Petry | 2013-10-22 | 1 | -0/+25 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexists | Thomas Müller | 2013-10-22 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Added warning notification when user home already exists | Vincent Petry | 2013-10-22 | 2 | -0/+19 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5455 from owncloud/fixing-2423-master | Thomas Müller | 2013-10-22 | 10 | -15/+32 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use OC_Helper::linkToDocs() in lib/private/config.php | Thomas Müller | 2013-10-21 | 1 | -1/+1 | |
| * | | | | | | | | | | introduce OC_Helper::linkToDocs() | Thomas Müller | 2013-10-21 | 3 | -6/+18 | |
| * | | | | | | | | | | introduce link_to_docs() and migrate links | Thomas Müller | 2013-10-21 | 9 | -15/+20 | |
* | | | | | | | | | | | Merge pull request #5437 from owncloud/create-custom-logfile | Thomas Müller | 2013-10-22 | 1 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Try to create custom log file before falling back to default. | Andreas Fischer | 2013-10-20 | 1 | -1/+11 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5426 from owncloud/fix-3612 | Vincent Petry | 2013-10-22 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Takes Import button to next line. | raghunayyar | 2013-10-21 | 1 | -1/+4 | |
| * | | | | | | | | | | Adds margin to the SSL root certificate button | raghunayyar | 2013-10-19 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #5446 from frisco82/fixNotifyUser | Frank Karlitschek | 2013-10-21 | 2 | -12/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | fix notify user, and made js more resiliant to changes | Ramiro Aparicio | 2013-10-21 | 2 | -12/+11 | |
* | | | | | | | | | | | Merge pull request #5249 from owncloud/activities-api | Thomas Müller | 2013-10-21 | 6 | -0/+184 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 26 | -476/+233 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | remove test code | Thomas Müller | 2013-10-16 | 1 | -4/+0 | |
| * | | | | | | | | | | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 990 | -21642/+19802 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | adding OC6 public API for activities | Thomas Müller | 2013-10-09 | 3 | -5/+44 | |
| * | | | | | | | | | | | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-09 | 1177 | -19806/+34007 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | initial implementation of activity manager | Thomas Müller | 2013-09-29 | 4 | -0/+73 | |
| * | | | | | | | | | | | | | | Merge branch 'appframework-master' into activities-api | Thomas Müller | 2013-09-29 | 689 | -9922/+23573 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | adding basic interfaces for the activities api | Thomas Müller | 2013-09-20 | 3 | -0/+77 | |
* | | | | | | | | | | | | | | | | Merge pull request #5120 from frisco82/sendEmailJS | Vincent Petry | 2013-10-21 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | 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 user displayName not being shown after add, added class for improved styl... | Ramiro Aparicio | 2013-10-21 | 2 | -8/+11 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #5452 from owncloud/fixing-4548-master | Frank Karlitschek | 2013-10-21 | 2 | -3/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | New OCS route: | Thomas Müller | 2013-10-21 | 2 | -3/+19 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | 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 | Vincent Petry | 2013-10-21 | 3 | -12/+4 | |
* | | | | | | | | | | | | | | | | | [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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | | | | Merge pull request #5434 from owncloud/fix5209 | blizzz | 2013-10-21 | 2 | -1/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | 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, fix... | Arthur Schiwon | 2013-10-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Merge pull request #5200 from owncloud/ie8-warning-fix | Frank Karlitschek | 2013-10-20 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix warning box in IE8 | Morris Jobke | 2013-10-16 | 1 | -0/+5 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5433 from owncloud/inputs-seem-disabled | Jan-Christoph Borchardt | 2013-10-20 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | 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 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5429 from owncloud/fix_cron_docu | Frank Karlitschek | 2013-10-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | change the language | Frank Karlitschek | 2013-10-20 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | harmonize this with the documentation. Once every minute is way to often. Eve... | Frank Karlitschek | 2013-10-19 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | [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 | |
|/ / / / / / / / / / / / / / |