aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1624 from owncloud/singleselectFrank Karlitschek2013-02-124-457/+399
|\
| * Split editable select code used for quota selection into a jquery pluginRobin Appelman2013-02-114-457/+399
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1257-305/+315
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1231-0/+74
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1156-179/+24
* | Merge pull request #1610 from owncloud/improved_personal_pageJan-Christoph Borchardt2013-02-112-6/+28
|\ \ | |/ |/|
| * move CSS to correct location, move and format phpJan-Christoph Borchardt2013-02-112-13/+11
| * 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-092-6/+30
* | I'm an evil bastard and I commit this 3 letter text fix without a pull request.Frank Karlitschek2013-02-091-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1157-57/+12
|/
* Merge pull request #1552 from raghunayyar/personalpage-style-fixBjörn Schießle2013-02-101-2/+2
|\
| * Personal Page Password Toggle Also Loads Well.raghunayyar2013-02-091-2/+2
* | add switch to enable/disable the possibility to change the display name by th...Björn Schießle2013-02-101-0/+4
* | Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-101-3/+3
|\ \
| * | TypoLukas Reschke2013-02-091-3/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-102-0/+44
* | | Remove uneeded linesLukas Reschke2013-02-091-4/+1
* | | Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-091-4/+1
|\ \ \
| * | | Better way of getting the navigation entries for an appBart Visscher2013-02-081-4/+1
| | |/ | |/|
* | | 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-8Thomas Müller2013-02-081-1/+1
| |/ /
* | | Merge pull request #1569 from owncloud/clean-app-idThomas Müller2013-02-094-2/+4
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into clean-app-idThomas Müller2013-02-095-1/+26
| |\ \
| * | | Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-094-2/+4
| | |/ | |/|
* | | Merge pull request #1561 from Raydiation/masterJörn Friedrich Dreyer2013-02-091-2/+3
|\ \ \
| * | | 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
* | | | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-2/+3
| |_|/ |/| |
* | | json_encode the appidLukas Reschke2013-02-091-1/+1
* | | Merge pull request #1481 from owncloud/fixing-1354-masterThomas Müller2013-02-092-0/+17
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into fixing-1354-masterThomas Mueller2013-02-0764-90/+191
| |\ \
| * | | show webdav test results in admin section as wellThomas Mueller2013-02-072-0/+16
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-092-0/+8
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-089-0/+49
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0754-74/+82
* | Merge pull request #1443 from owncloud/use-module-file-info-masterLukas Reschke2013-02-062-1/+15
|\ \
| * | we get best results regarding mime type detection if we use fileinfo - let's ...Thomas Mueller2013-02-042-1/+15
* | | Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-061-0/+3
|\ \ \
| * | | Reverted fix temporarily; another fix by LukasReschke is awaiting mergeSam Tuke2013-02-061-1/+3
| * | | Merge branch 'master' into files_encryptionSam Tuke2013-02-063-3/+2
| |\ \ \
| * | | | Added commentSam Tuke2013-02-061-0/+1
| * | | | Fixed bug causing password change related hooks to not be called due to ajaxSam Tuke2013-02-061-0/+2
| * | | | Merge branch 'master' into files_encryptionSam Tuke2013-02-062-3/+10
| |\ \ \ \
| * | | | | Removed call to depreciated isUserVerified()Sam Tuke2013-02-061-3/+1
* | | | | | Merge pull request #1363 from owncloud/FixPasswordChangeLukas Reschke2013-02-061-8/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix indentationLukas Reschke2013-01-301-1/+1
| * | | | | Remove the no longer existing function "isUserVerified"Lukas Reschke2013-01-301-7/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-31 23:50:06 +0000