summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Collapse)AuthorAgeFilesLines
* fixes 1933 - the locale name is no longer part of the translation stringThomas Mueller2013-02-271-1/+4
|
* Join split translated stringsBart Visscher2013-02-211-4/+1
|
* Style cleanup settingsBart Visscher2013-02-213-20/+41
|
* Correct new password input nameVictor Dubiniuk2013-02-181-1/+1
|
* fix user delete button not showing in IE, another SVG replacement issueJan-Christoph Borchardt2013-02-141-1/+1
|
* Merge pull request #1624 from owncloud/singleselectFrank Karlitschek2013-02-121-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 pluginRobin Appelman2013-02-111-33/+29
| |
* | move CSS to correct location, move and format phpJan-Christoph Borchardt2013-02-111-9/+3
| |
* | spaces to tabsJan-Christoph Borchardt2013-02-111-10/+10
| |
* | correct target blank from image to linkJan-Christoph Borchardt2013-02-111-6/+6
| |
* | add in new windowFrank Karlitschek2013-02-091-3/+3
| |
* | add the buttons for the clients to the personal page.Frank Karlitschek2013-02-091-6/+25
|/ | | | Useful and prettier
* Merge pull request #1552 from raghunayyar/personalpage-style-fixBjörn Schießle2013-02-101-2/+2
|\ | | | | Personal Page Password Toggle Loads Fine.
| * Personal Page Password Toggle Also Loads Well.raghunayyar2013-02-091-2/+2
| |
* | Merge pull request #1543 from owncloud/utf8-locale-masterThomas Müller2013-02-091-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-8Thomas Müller2013-02-081-1/+1
| |/
* | Merge pull request #1561 from Raydiation/masterJörn Friedrich Dreyer2013-02-091-2/+3
|\ \ | | | | | | Moved the iframe height and width fix from js to css
| * | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-2/+3
| |/
* | Revert "moved iframe height and width fix from js to css"Bernhard Posselt2013-02-091-3/+2
| | | | | | | | This reverts commit 842fc85b9a42aaa0ce31c71e05507ed5eeaa6dc4.
* | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-2/+3
| |
* | Merge branch 'master' into fixing-1354-masterThomas Mueller2013-02-074-5/+36
|\| | | | | | | | | | | Conflicts: settings/admin.php settings/templates/admin.php
| * Merge pull request #1443 from owncloud/use-module-file-info-masterLukas Reschke2013-02-061-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 Mueller2013-02-041-1/+14
| | | | | | | | | | | | tell the admin about that
| * | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-062-2/+2
| |\ \ | | | | | | | | Fix leftcontent positioning. Ref #1255
| | * | Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-042-2/+2
| | |/
| * | make it possible to modify the links to the clientsGeorg Ehrke2013-02-061-3/+3
| | |
| * | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-061-0/+17
| | |
* | | show webdav test results in admin section as wellThomas Mueller2013-02-071-0/+15
|/ /
* / offer change password only when the action is supported by the user backendArthur Schiwon2013-02-051-1/+6
|/
* Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-311-3/+4
|\ | | | | Improved appsmanagement
| * remove leftover codeFrank Karlitschek2013-01-301-3/+0
| |
| * merge masterFrank Karlitschek2013-01-305-197/+180
| |\ | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-301-2/+1
| | |
| * | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-211-1/+3
| | |
* | | make strings translatableBjörn Schießle2013-01-301-2/+2
| |/ |/|
* | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-291-3/+9
|\ \ | | | | | | introduction of display names
| * | rename Name to Login NameBjörn Schießle2013-01-281-2/+2
| | |
| * | show display name in input fieldBjörn Schießle2013-01-281-1/+2
| | |
| * | interface and API to change display namesBjörn Schießle2013-01-281-1/+1
| | |
| * | prepare user table to show and edit display namesBjörn Schießle2013-01-281-1/+6
| | |
| * | compare the correct uidsBjörn Schießle2013-01-251-1/+1
| | |
* | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-2/+0
|\ \ \ | | | | | | | | Fixing 998 master
| * | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-185-145/+172
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js
| * | | displaying notification now centeredThomas Mueller2013-01-111-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 fileLukas Reschke2013-01-231-1/+2
| | | |
* | | | Remove uneeded JSLukas Reschke2013-01-221-22/+1
| | | |
* | | | External JSON for the AppsLukas Reschke2013-01-211-7/+3
| | | |
* | | | Move isadmin to external fileLukas Reschke2013-01-211-3/+3
| |/ / |/| |
* | | Spaces to tabsBart Visscher2013-01-165-169/+169
| | |
* | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-141-0/+27
|\ \ \ | | |/ | |/|