Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1543 from owncloud/utf8-locale-master | Thomas Müller | 2013-02-09 | 1 | -1/+1 |
|\ | |||||
| * | some systems use en_US.UTF8 instead of en_US.UTF-8 | Thomas Müller | 2013-02-08 | 1 | -1/+1 |
* | | Merge pull request #1561 from Raydiation/master | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -2/+3 |
|\ \ | |||||
| * | | moved iframe height and width fix from js to css | Bernhard Posselt | 2013-02-09 | 1 | -2/+3 |
| |/ | |||||
* | | Revert "moved iframe height and width fix from js to css" | Bernhard Posselt | 2013-02-09 | 1 | -3/+2 |
* | | moved iframe height and width fix from js to css | Bernhard Posselt | 2013-02-09 | 1 | -2/+3 |
* | | Merge branch 'master' into fixing-1354-master | Thomas Mueller | 2013-02-07 | 4 | -5/+36 |
|\| | |||||
| * | Merge pull request #1443 from owncloud/use-module-file-info-master | Lukas Reschke | 2013-02-06 | 1 | -1/+14 |
| |\ | |||||
| | * | we get best results regarding mime type detection if we use fileinfo - let's ... | Thomas Mueller | 2013-02-04 | 1 | -1/+14 |
| * | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 2 | -2/+2 |
| | |/ | |||||
| * | | make it possible to modify the links to the clients | Georg Ehrke | 2013-02-06 | 1 | -3/+3 |
| * | | let the user change his display name, if supported by the back-end | Björn Schießle | 2013-02-06 | 1 | -0/+17 |
* | | | show webdav test results in admin section as well | Thomas Mueller | 2013-02-07 | 1 | -0/+15 |
|/ / | |||||
* / | offer change password only when the action is supported by the user backend | Arthur Schiwon | 2013-02-05 | 1 | -1/+6 |
|/ | |||||
* | Merge pull request #1379 from owncloud/improved_appsmanagement | Lukas Reschke | 2013-01-31 | 1 | -3/+4 |
|\ | |||||
| * | remove leftover code | Frank Karlitschek | 2013-01-30 | 1 | -3/+0 |
| * | merge master | Frank Karlitschek | 2013-01-30 | 5 | -197/+180 |
| |\ | |||||
| * | | mark recommended apps. server part not yet fully implemented | Frank Karlitschek | 2013-01-30 | 1 | -2/+1 |
| * | | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 1 | -1/+3 |
* | | | make strings translatable | Björn Schießle | 2013-01-30 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 1 | -3/+9 |
|\ \ | |||||
| * | | rename Name to Login Name | Björn Schießle | 2013-01-28 | 1 | -2/+2 |
| * | | show display name in input field | Björn Schießle | 2013-01-28 | 1 | -1/+2 |
| * | | interface and API to change display names | Björn Schießle | 2013-01-28 | 1 | -1/+1 |
| * | | prepare user table to show and edit display names | Björn Schießle | 2013-01-28 | 1 | -1/+6 |
| * | | compare the correct uids | Björn Schießle | 2013-01-25 | 1 | -1/+1 |
* | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -2/+0 |
|\ \ \ | |||||
| * | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 5 | -145/+172 |
| |\| | | |||||
| * | | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 1 | -2/+0 |
* | | | | Move appid to external file | Lukas Reschke | 2013-01-23 | 1 | -1/+2 |
* | | | | Remove uneeded JS | Lukas Reschke | 2013-01-22 | 1 | -22/+1 |
* | | | | External JSON for the Apps | Lukas Reschke | 2013-01-21 | 1 | -7/+3 |
* | | | | Move isadmin to external file | Lukas Reschke | 2013-01-21 | 1 | -3/+3 |
| |/ / |/| | | |||||
* | | | Spaces to tabs | Bart Visscher | 2013-01-16 | 5 | -169/+169 |
* | | | Merge branch 'master' into fixing-unused-and-undefined-in-master | Thomas Mueller | 2013-01-14 | 1 | -0/+27 |
|\ \ \ | | |/ | |/| | |||||
| * | | Removed uneeded HTML tag | Lukas Reschke | 2013-01-11 | 1 | -1/+1 |
| * | | Add security section to admin menu | Lukas Reschke | 2013-01-11 | 1 | -0/+27 |
| |/ | |||||
* / | fixing <input> tag | Thomas Mueller | 2013-01-07 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1053 from owncloud/ocs_api | Michael Gapczynski | 2013-01-04 | 2 | -0/+39 |
|\ | |||||
| * | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-31 | 4 | -151/+207 |
| |\ | |||||
| * \ | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-16 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 5 | -8/+26 |
| |\ \ \ | |||||
| * \ \ \ | Merge master into ocs_api | Tom Needham | 2012-10-28 | 2 | -3/+5 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into ocs_api | Tom Needham | 2012-09-17 | 1 | -7/+26 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Fix merge conflicts | Tom Needham | 2012-09-13 | 6 | -37/+118 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Check if required apps are installed | Tom Needham | 2012-07-30 | 2 | -3/+22 |
| * | | | | | | | Improve styling of permission request page | Tom Needham | 2012-07-30 | 1 | -12/+13 |
| * | | | | | | | Basic template for authorising exernal apps with OAuth | Tom Needham | 2012-07-30 | 1 | -0/+19 |
* | | | | | | | | omit type attribute in script tag to use fallback (text/javascript) | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | |