Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-10 | 2 | -0/+44 |
* | Remove uneeded lines | Lukas Reschke | 2013-02-09 | 1 | -4/+1 |
* | Merge pull request #1546 from owncloud/fix-loading-hooks | Thomas Müller | 2013-02-09 | 1 | -4/+1 |
|\ | |||||
| * | Better way of getting the navigation entries for an app | Bart Visscher | 2013-02-08 | 1 | -4/+1 |
* | | 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 #1569 from owncloud/clean-app-id | Thomas Müller | 2013-02-09 | 4 | -2/+4 |
|\ \ | |||||
| * \ | Merge branch 'master' into clean-app-id | Thomas Müller | 2013-02-09 | 5 | -1/+26 |
| |\ \ | |||||
| * | | | Remove invalid characters from app id to prevent loading of invalid resources | Bart Visscher | 2013-02-09 | 4 | -2/+4 |
| | |/ | |/| | |||||
* | | | 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 |
| |_|/ |/| | | |||||
* | | | json_encode the appid | Lukas Reschke | 2013-02-09 | 1 | -1/+1 |
* | | | Merge pull request #1481 from owncloud/fixing-1354-master | Thomas Müller | 2013-02-09 | 2 | -0/+17 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into fixing-1354-master | Thomas Mueller | 2013-02-07 | 64 | -90/+191 |
| |\ \ | |||||
| * | | | show webdav test results in admin section as well | Thomas Mueller | 2013-02-07 | 2 | -0/+16 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-09 | 2 | -0/+8 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-08 | 9 | -0/+49 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-07 | 54 | -74/+82 |
* | | Merge pull request #1443 from owncloud/use-module-file-info-master | Lukas Reschke | 2013-02-06 | 2 | -1/+15 |
|\ \ | |||||
| * | | we get best results regarding mime type detection if we use fileinfo - let's ... | Thomas Mueller | 2013-02-04 | 2 | -1/+15 |
* | | | Merge pull request #1506 from owncloud/files_encryption | Lukas Reschke | 2013-02-06 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Reverted fix temporarily; another fix by LukasReschke is awaiting merge | Sam Tuke | 2013-02-06 | 1 | -1/+3 |
| * | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-02-06 | 3 | -3/+2 |
| |\ \ \ | |||||
| * | | | | Added comment | Sam Tuke | 2013-02-06 | 1 | -0/+1 |
| * | | | | Fixed bug causing password change related hooks to not be called due to ajax | Sam Tuke | 2013-02-06 | 1 | -0/+2 |
| * | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-02-06 | 2 | -3/+10 |
| |\ \ \ \ | |||||
| * | | | | | Removed call to depreciated isUserVerified() | Sam Tuke | 2013-02-06 | 1 | -3/+1 |
* | | | | | | Merge pull request #1363 from owncloud/FixPasswordChange | Lukas Reschke | 2013-02-06 | 1 | -8/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix indentation | Lukas Reschke | 2013-01-30 | 1 | -1/+1 |
| * | | | | | Remove the no longer existing function "isUserVerified" | Lukas Reschke | 2013-01-30 | 1 | -7/+1 |
* | | | | | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 3 | -3/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add 'hascontrols' class for content with fixed topbar. | Thomas Tanghus | 2013-02-04 | 2 | -2/+2 |
| * | | | | | Remove padding hack to position users list. | Thomas Tanghus | 2013-02-04 | 1 | -1/+0 |
* | | | | | | make it possible to modify the links to the clients | Georg Ehrke | 2013-02-06 | 2 | -3/+10 |
| |_|/ / / |/| | | | | |||||
* | | | | | make strings translatable | Björn Schießle | 2013-02-06 | 1 | -2/+2 |
* | | | | | let the user change his display name, if supported by the back-end | Björn Schießle | 2013-02-06 | 5 | -2/+51 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-06 | 3 | -0/+26 |
| |_|_|/ |/| | | | |||||
* | | | | offer change password only when the action is supported by the user backend | Arthur Schiwon | 2013-02-05 | 2 | -1/+7 |
* | | | | Remove superfluous append | Thomas Tanghus | 2013-02-05 | 1 | -1/+0 |
* | | | | remove superfluous enabled-app class again | Jan-Christoph Borchardt | 2013-02-05 | 1 | -1/+1 |
* | | | | Merge branch 'master' into fix_addNavigation | Jan-Christoph Borchardt | 2013-02-05 | 7 | -29/+90 |
|\ \ \ \ | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-05 | 2 | -0/+12 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #1229 from owncloud/from_live_to_on | Thomas Müller | 2013-02-03 | 1 | -9/+9 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into from_live_to_on | Thomas Mueller | 2013-01-31 | 20 | -43/+157 |
| | |\ \ \ | |||||
| | * | | | | use on instead of live in users.js | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -1/+1 |
| | * | | | | replace live() with on() in core js | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -8/+8 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-04 | 4 | -20/+69 |
| | |_|/ / | |/| | | | |||||
* / | | | | Make app icon linkable when enabling app. | Thomas Tanghus | 2013-02-03 | 1 | -0/+1 |
|/ / / / |