summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1601 from owncloud/lightbox-iconsBernhard Posselt2013-02-1014-0/+510
|\
| * split close and delete icon, add red hover for deleteJan-Christoph Borchardt2013-02-104-0/+146
| * add big white icons for lightbox, slideshow etcJan-Christoph Borchardt2013-02-1010-0/+364
* | Merge pull request #1552 from raghunayyar/personalpage-style-fixBjörn Schießle2013-02-101-7/+8
|\ \
| * | Personal Page Password Toggle Also Loads Well.raghunayyar2013-02-091-7/+8
* | | Merge pull request #1538 from raghunayyar/admin-password-toggleJan-Christoph Borchardt2013-02-103-2/+4
|\ \ \
| * | | Removed whitespace from installation.phpraghunayyar2013-02-081-3/+3
| * | | Password Toggle Works on Installation as well.raghunayyar2013-02-083-5/+7
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-108-1/+21
* | | Merge pull request #1569 from owncloud/clean-app-idThomas Müller2013-02-091-0/+1
|\ \ \
| * \ \ Merge branch 'master' into clean-app-idThomas Müller2013-02-0947-109/+101
| |\ \ \ | | | |/ | | |/|
| * | | Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-091-0/+1
| | |/ | |/|
* | | added icons and mimetypes for .msi and .exe filesBernhard Posselt2013-02-091-0/+0
* | | Merge pull request #1561 from Raydiation/masterJörn Friedrich Dreyer2013-02-091-0/+2
|\ \ \
| * | | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-0/+2
* | | | Revert "moved iframe height and width fix from js to css"Bernhard Posselt2013-02-091-2/+0
* | | | Revert "added exe and msi filetypes and icon"Bernhard Posselt2013-02-091-0/+0
* | | | added exe and msi filetypes and iconBernhard Posselt2013-02-091-0/+0
* | | | moved iframe height and width fix from js to cssBernhard Posselt2013-02-091-0/+2
| |_|/ |/| |
* | | Merge pull request #1481 from owncloud/fixing-1354-masterThomas Müller2013-02-092-1/+5
|\ \ \
| * \ \ Merge branch 'master' into fixing-1354-masterThomas Mueller2013-02-074-7/+39
| |\ \ \
| * | | | Execute the post setup check after finishing the setupBart Visscher2013-02-062-1/+5
* | | | | Merge pull request #1545 from owncloud/fix-oc_webrootThomas Müller2013-02-091-1/+3
|\ \ \ \ \
| * | | | | fix-oc_webrootBart Visscher2013-02-081-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlersThomas Müller2013-02-091-60/+71
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | attach handlers to document instead of filelist, minor whitespace cleanupsJörn Friedrich Dreyer2013-02-081-60/+71
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0941-41/+15
* | | | Merge pull request #1547 from owncloud/navigation-colorThomas Müller2013-02-081-2/+2
|\ \ \ \
| * | | | brighter grey for the navigation bar, hopefully solves the weird similarity t...Jan-Christoph Borchardt2013-02-081-2/+2
| |/ / /
* | | | use proper HTML for other security warning tooJan-Christoph Borchardt2013-02-081-3/+2
* | | | improve and shorten security warning, add link to docs, fix #1342Jan-Christoph Borchardt2013-02-082-1/+3
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0853-53/+13
* | | Merge pull request #1514 from owncloud/fix-setupLukas Reschke2013-02-075-8/+7
|\ \ \
| * | | Fill oc_webroot with the expected valueBart Visscher2013-02-071-0/+1
| * | | Fix disabling setup form on submitBart Visscher2013-02-071-5/+3
| * | | Define the variables that are expected to exist but won't be set in setupBart Visscher2013-02-071-0/+3
| * | | Move loading of js_config to templatelayoutBart Visscher2013-02-073-3/+0
* | | | Merge pull request #1529 from owncloud/installation-login-fixesThomas Müller2013-02-073-28/+22
|\ \ \ \
| * | | | make show password toggle work for installation (once #1525 is fixed)Jan-Christoph Borchardt2013-02-072-4/+6
| * | | | make show password not specific to log inJan-Christoph Borchardt2013-02-072-7/+6
| * | | | remove duplicate show password toggle code, move current one to proper locationJan-Christoph Borchardt2013-02-071-19/+11
| * | | | some comments for CSS documentationJan-Christoph Borchardt2013-02-071-3/+3
| * | | | fix database labels having left paddingJan-Christoph Borchardt2013-02-071-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #1526 from owncloud/l10n-support-masterLukas Reschke2013-02-072-3/+3
|\ \ \ \
| * | | | l10n support enhanced in coreThomas Mueller2013-02-072-3/+3
| |/ / /
* | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layoutblizzz2013-02-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix warning with displayname in user layout templateBart Visscher2013-02-071-1/+1
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-02-071-0/+3
|/ /
* | fix shorttag issue mentioned in #1357Jan-Christoph Borchardt2013-02-061-2/+2
* | Merge pull request #1459 from owncloud/infield-detailJan-Christoph Borchardt2013-02-061-1/+1
|\ \