Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixes 1933 - the locale name is no longer part of the translation string | Thomas Mueller | 2013-02-27 | 1 | -1/+4 |
| | |||||
* | Join split translated strings | Bart Visscher | 2013-02-21 | 1 | -4/+1 |
| | |||||
* | Style cleanup settings | Bart Visscher | 2013-02-21 | 3 | -20/+41 |
| | |||||
* | Correct new password input name | Victor Dubiniuk | 2013-02-18 | 1 | -1/+1 |
| | |||||
* | fix user delete button not showing in IE, another SVG replacement issue | Jan-Christoph Borchardt | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1624 from owncloud/singleselect | Frank Karlitschek | 2013-02-12 | 1 | -33/+29 |
|\ | | | | | Split editable select code used for quota selection into a jquery plugin | ||||
| * | Split editable select code used for quota selection into a jquery plugin | Robin Appelman | 2013-02-11 | 1 | -33/+29 |
| | | |||||
* | | move CSS to correct location, move and format php | Jan-Christoph Borchardt | 2013-02-11 | 1 | -9/+3 |
| | | |||||
* | | spaces to tabs | Jan-Christoph Borchardt | 2013-02-11 | 1 | -10/+10 |
| | | |||||
* | | correct target blank from image to link | Jan-Christoph Borchardt | 2013-02-11 | 1 | -6/+6 |
| | | |||||
* | | add in new window | Frank Karlitschek | 2013-02-09 | 1 | -3/+3 |
| | | |||||
* | | add the buttons for the clients to the personal page. | Frank Karlitschek | 2013-02-09 | 1 | -6/+25 |
|/ | | | | Useful and prettier | ||||
* | Merge pull request #1552 from raghunayyar/personalpage-style-fix | Björn Schießle | 2013-02-10 | 1 | -2/+2 |
|\ | | | | | Personal Page Password Toggle Loads Fine. | ||||
| * | Personal Page Password Toggle Also Loads Well. | raghunayyar | 2013-02-09 | 1 | -2/+2 |
| | | |||||
* | | 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 | ||||
| * | | 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 the iframe height and width fix from js to css | ||||
| * | | 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 |
| | | | | | | | | This reverts commit 842fc85b9a42aaa0ce31c71e05507ed5eeaa6dc4. | ||||
* | | 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 |
|\| | | | | | | | | | | | Conflicts: settings/admin.php settings/templates/admin.php | ||||
| * | 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 - l... | ||||
| | * | we get best results regarding mime type detection if we use fileinfo - let's ↵ | Thomas Mueller | 2013-02-04 | 1 | -1/+14 |
| | | | | | | | | | | | | tell the admin about that | ||||
| * | | Merge pull request #1428 from owncloud/content_positioning | Thomas Tanghus | 2013-02-06 | 2 | -2/+2 |
| |\ \ | | | | | | | | | Fix leftcontent positioning. Ref #1255 | ||||
| | * | | 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 |
|\ | | | | | Improved appsmanagement | ||||
| * | remove leftover code | Frank Karlitschek | 2013-01-30 | 1 | -3/+0 |
| | | |||||
| * | merge master | Frank Karlitschek | 2013-01-30 | 5 | -197/+180 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php | ||||
| * | | 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 |
|\ \ | | | | | | | introduction of display names | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Fixing 998 master | ||||
| * | | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 5 | -145/+172 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js | ||||
| * | | | displaying notification now centered | Thomas Mueller | 2013-01-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | The notification div has been moved to the user templates. Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline. | ||||
* | | | | 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 |
|\ \ \ | | |/ | |/| |