summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update mimetypesRoeland Jago Douma2016-08-193-4/+8
|
* Merge pull request #945 from nextcloud/kill_ajax_share.phpJoas Schilling2016-08-192-378/+0
|\ | | | | Kill ajax/share.php
| * Kill ajax/share.phpRoeland Jago Douma2016-08-182-378/+0
| | | | | | | | | | Using this file will insert invalid shares. OCS has to be used exclusively!
* | Merge pull request #906 from nextcloud/files_external-settings-polish-missingMarius Blüm2016-08-182-2/+13
|\ \ | |/ |/| Files external settings polish
| * fix error when not logged inRobin Appelman2016-08-181-0/+4
| |
| * change remote cloud naming to NextcloudRobin Appelman2016-08-181-1/+1
| |
| * dont register personal files_external setting if it's emptyRobin Appelman2016-08-181-1/+8
| |
* | Merge pull request #937 from nextcloud/fix_app_searchRoeland Jago Douma2016-08-182-1/+3
|\ \ | | | | | | SVG defintions always take the first one
| * | SVG defintions always take the first oneRoeland Jago Douma2016-08-182-1/+3
| | | | | | | | | | | | * Move filter definition out
* | | Merge pull request #903 from nextcloud/allow-disable-commentsMorris Jobke2016-08-181-7/+3
|\ \ \ | | | | | | | | Revert "Always add activities for comments to the stream"
| * | | Revert "Always add activities for comments to the stream"Joas Schilling2016-08-171-7/+3
| | | | | | | | | | | | | | | | This reverts commit 48c41b888c6a464f645de3e9087a39c163086d9f
* | | | Merge pull request #925 from nextcloud/use-util-methodsMorris Jobke2016-08-181-3/+5
|\ \ \ \ | |_|/ / |/| | | Load the Template class in case it's not loaded
| * | | Load the Template class in case it's not loadedJoas Schilling2016-08-181-3/+5
| | | |
* | | | Merge pull request #934 from nextcloud/add-cachebustersblizzz2016-08-187-26/+27
|\ \ \ \ | | | | | | | | | | Add cachebusters
| * | | | Add cachebuster to app icons in the admin screenLukas Reschke2016-08-181-2/+2
| | | | |
| * | | | Add cachebuster to apps.cssLukas Reschke2016-08-181-7/+7
| | | | |
| * | | | Add cachebuster to apps.cssLukas Reschke2016-08-181-3/+3
| | | | |
| * | | | Add cachebuster to styles.cssLukas Reschke2016-08-181-8/+8
| | | | |
| * | | | Add cachebuster to right navigationLukas Reschke2016-08-181-2/+2
| | | | |
| * | | | Add cache buster to left menu barLukas Reschke2016-08-182-2/+3
| | | | |
| * | | | Add cache buster to logoLukas Reschke2016-08-181-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #927 from nextcloud/drop-unneeded-statementsRoeland Jago Douma2016-08-181-8/+1
|\ \ \ \ | | | | | | | | | | white-space: pre-wrap is supported on all current browsers
| * | | | white-space: pre-wrap is supported on all current browsersMorris Jobke2016-08-181-8/+1
| | |/ / | |/| | | | | | | | | | | | | | * Chrome 1, Firefox 3, IE8, Opera 8 and Safari 3 * see https://developer.mozilla.org/en-US/docs/Web/CSS/white-space
* | | | Merge pull request #931 from nextcloud/replace-hardcoded-classnameblizzz2016-08-181-4/+4
|\ \ \ \ | | | | | | | | | | let the containers resolving capabilities find and instantiate the ri…
| * | | | let the containers resolving capabilities find and instantiate the right serviceArthur Schiwon2016-08-181-4/+4
| |/ / /
* | | | Merge pull request #930 from nextcloud/check-isset-requireRoeland Jago Douma2016-08-181-2/+2
|\ \ \ \ | | | | | | | | | | Fix "Undefined index" when the values do not exist
| * | | | Fix "Undefined index" when the values do not existJoas Schilling2016-08-181-2/+2
| |/ / /
* | | | Merge pull request #928 from nextcloud/followup-714-double-ending-quoteRoeland Jago Douma2016-08-181-1/+1
|\ \ \ \ | | | | | | | | | | Fix double ending quotes
| * | | | Fix double ending quotesJoas Schilling2016-08-181-1/+1
| |/ / /
* | | | Merge pull request #923 from nextcloud/owncloud-gmbh-owns-the-cr-nowRoeland Jago Douma2016-08-181-1/+1
|\ \ \ \ | |_|/ / |/| | | Make sure to also detect their new copy right line
| * | | Make sure to also detect their new copy right lineJoas Schilling2016-08-181-1/+1
| | | | | | | | | | | | | | | | Ref owncloud/core#25518
* | | | Merge pull request #929 from nextcloud/revert-778-Faldon-user_menu_uiMorris Jobke2016-08-181-25/+9
|\ \ \ \ | |_|/ / |/| | | Revert "Fixing infinite spinning animation on user menu ctrl+click"
| * | | Revert "Fixing infinite spinning animation on user menu ctrl+click"Morris Jobke2016-08-181-25/+9
|/ / /
* | | Merge pull request #714 from nextcloud/comments-layoutLukas Reschke2016-08-183-29/+59
|\ \ \ | | | | | | | | fix design details in comments sidebar
| * | | Improve layout of cancel button in the comments sidebarMorris Jobke2016-08-182-1/+5
| | | |
| * | | Fix layout of comments submit button on all screen sizesMorris Jobke2016-08-181-4/+4
| | | | | | | | | | | | | | | | * tested in IE10, IE11, Edge, Chrome and Firefox
| * | | Fix js unit testRoeland Jago Douma2016-08-171-2/+2
| | | |
| * | | Fix edit comment layoutRoeland Jago Douma2016-08-171-1/+1
| | | |
| * | | fix design details in comments sidebarJan-Christoph Borchardt2016-08-172-26/+52
| | | |
* | | | Merge pull request #917 from nextcloud/share_api_use_parametersLukas Reschke2016-08-183-578/+210
|\ \ \ \ | |_|/ / |/| | | Share API use parameters
| * | | Cleanup TestsRoeland Jago Douma2016-08-172-173/+80
| | | |
| * | | Move updateShare and getShares over to use proper parametersRoeland Jago Douma2016-08-173-156/+81
| | | | | | | | | | | | | | | | * Update tests
| * | | Use parameters in createShareRoeland Jago Douma2016-08-173-280/+80
| | | | | | | | | | | | | | | | * Fix tests
* | | | Merge pull request #778 from nextcloud/Faldon-user_menu_uiMorris Jobke2016-08-181-9/+25
|\ \ \ \ | |/ / / |/| | | Fixing infinite spinning animation on user menu ctrl+click
| * | | Removed debug code.Faldon2016-08-111-1/+0
| | | |
| * | | Fixed user and main menu closing on right mouse button click.Thomas Pulzer2016-08-111-7/+8
| | | | | | | | | | | | | | | | Fixed wrong variable assignment when trying to open link in new window.
| * | | Changed app and user menu delegates to mousedown events.Thomas Pulzer2016-08-091-4/+13
| | | | | | | | | | | | | | | | | | | | Added proper handling of primary mouse button click with and without ctrl-/meta-key modifier. Added handlig of middle mouse button click.
| * | | Added OS X meta key check for stopping spinning animation in app and user menu.Thomas Pulzer2016-08-091-2/+2
| | | |
| * | | Fixed user menu to not show spinner on ctrl+click.Thomas Pulzer2016-08-091-3/+10
| | | | | | | | | | | | | | | | Fixes #616
* | | | Merge pull request #916 from nextcloud/password_controller_composerRoeland Jago Douma2016-08-172-2/+2
|\ \ \ \ | | | | | | | | | | Add ChangePasswordController to autoloader