Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Modified overflow in multiselector | Sergio Bertolín | 2016-08-29 | 1 | -0/+2 |
| | |||||
* | Merge pull request #1093 from nextcloud/mail-fontstack | Raghu Nayyar | 2016-08-28 | 1 | -1/+1 |
|\ | | | | | use proper font stack for email | ||||
| * | use proper font stack for email | Jan-Christoph Borchardt | 2016-08-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1097 from nextcloud/2fa-cancel-login-styling | Jan-Christoph Borchardt | 2016-08-27 | 1 | -2/+4 |
|\ \ | | | | | | | Small design fixes for "Cancel login" link on the 2FA challenge page | ||||
| * | | fix double semicolon | Jan-Christoph Borchardt | 2016-08-27 | 1 | -1/+1 |
| | | | |||||
| * | | 2fa cancel login styling | Christoph Wurst | 2016-08-27 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #1098 from nextcloud/2fa-challenge-styling | Jan-Christoph Borchardt | 2016-08-27 | 3 | -32/+38 |
|\ \ \ | | | | | | | | | 2fa challenge styling | ||||
| * | | | list 2FA providers as buttons | Christoph Wurst | 2016-08-27 | 3 | -5/+8 |
| | | | | |||||
| * | | | use centered h2 for 2FA page headers | Christoph Wurst | 2016-08-27 | 3 | -22/+26 |
| | | | | |||||
| * | | | fix 2fa challenge page wording | Christoph Wurst | 2016-08-27 | 2 | -3/+2 |
| | | | | |||||
| * | | | reorder 2fa challenge HTML | Christoph Wurst | 2016-08-27 | 1 | -7/+7 |
| |/ / | |||||
* | | | Merge pull request #968 from Faldon/fixing_spinner_animation | Lukas Reschke | 2016-08-27 | 1 | -5/+28 |
|\ \ \ | | | | | | | | | Fixing infinite spinner animation | ||||
| * | | | Fixing infinite spinner animation | Thomas Pulzer | 2016-08-19 | 1 | -5/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setupMainMenu() & setupUserMenu(): Changed click delegate to add the spinner animation only the primary mouse button was clicked without ctrl- or meta-key modifier Adding mouseup delegate to hide the menu if the middle mouse button was clicked. Redone #778 | ||||
* | | | | Merge pull request #1058 from nextcloud/avatarController_cleanup | Lukas Reschke | 2016-08-27 | 2 | -54/+23 |
|\ \ \ \ | |_|/ / |/| | | | Avatar controller cleanup | ||||
| * | | | Remove unused core wrappers | Roeland Jago Douma | 2016-08-25 | 1 | -20/+0 |
| | | | | |||||
| * | | | AvatarController cleanup | Roeland Jago Douma | 2016-08-25 | 2 | -34/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use all DI components * Let the AppFramework resolve the AvatarController * Update unit tests * Unit tests no longer require DB | ||||
* | | | | Merge pull request #1088 from nextcloud/core_tags_cleanup | Lukas Reschke | 2016-08-26 | 2 | -166/+0 |
|\ \ \ \ | | | | | | | | | | | Tag cleanup | ||||
| * | | | | Remove the core tag routes since they are broken | Roeland Jago Douma | 2016-08-26 | 2 | -166/+0 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | Private internal stuff that nobody *should* be using anyways. But on top of that already broken for a long time. So nobody could be using it even. | ||||
* | | | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop | Joas Schilling | 2016-08-26 | 1 | -4/+6 |
|\ \ \ \ | |/ / / |/| | | | prevent infinite redirect loops if the there is no 2fa provider to pass | ||||
| * | | | prevent infinite redirect loops if the there is no 2fa provider to pass | Christoph Wurst | 2016-08-24 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes infinite loops that are caused whenever a user is about to solve a 2FA challenge, but the provider app is disabled at the same time. Since the session value usually indicates that the challenge needs to be solved before we grant access we have to remove that value instead in this special case. | ||||
* | | | | adjust js tests | Arthur Schiwon | 2016-08-25 | 1 | -4/+4 |
| | | | | |||||
* | | | | fix internal links in security & setup warnings, resolves #1048 | Arthur Schiwon | 2016-08-25 | 1 | -2/+3 |
| |/ / |/| | | |||||
* | | | Add cachebuster to icons.css | Lukas Reschke | 2016-08-24 | 1 | -71/+71 |
| | | | |||||
* | | | Move the reset token to core app | Joas Schilling | 2016-08-23 | 2 | -4/+4 |
| | | | |||||
* | | | Remove "password reset token" after successful login | Joas Schilling | 2016-08-23 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #956 from nextcloud/fix_952 | Lukas Reschke | 2016-08-23 | 1 | -2/+2 |
|\ \ | | | | | | | When using permalinks don't error out if file id can't be found | ||||
| * | | When using permalinks don't error out if file id can't be found | Roeland Jago Douma | 2016-08-19 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | | | Fixes #952 * Use only the index route (since it went to showFile anyways) * Fix tests * Use getUserFolder to force init of users mounts | ||||
* | | Merge pull request #1000 from nextcloud/mail_icon_share | Roeland Jago Douma | 2016-08-22 | 3 | -5/+5 |
|\ \ | | | | | | | Make e-mail icon visible | ||||
| * | | Make e-mail icon visible | Roeland Jago Douma | 2016-08-21 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #996 * Make mail icon visible * Opacity to .5 * Add tooltip | ||||
* | | | Fix some jshint issues in core/js/share* | Roeland Jago Douma | 2016-08-19 | 7 | -11/+19 |
|/ / | |||||
* | | Remove uninterpreted PHP | Lukas Reschke | 2016-08-19 | 1 | -1/+1 |
| | | | | | | | | This is in an HTML file. The PHP won't be executed :see_no_evil: | ||||
* | | Merge pull request #964 from ↵ | Lukas Reschke | 2016-08-19 | 1 | -1/+4 |
|\ \ | | | | | | | | | | | | | nextcloud/master-aedae12db5ebfaf56bec91b736fb8a569cecf16f [master] In cases where the server dictates the link share expiration… | ||||
| * | | [master] In cases where the server dictates the link share expiration the ↵ | Thomas Müller | 2016-08-19 | 1 | -1/+4 |
| | | | | | | | | | | | | date is not updated on consequitive changes and enable/disable actions | ||||
* | | | Merge pull request #959 from nextcloud/map_mobi | Marius Blüm | 2016-08-19 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | Update mimetypes | ||||
| * | | Update mimetypes | Roeland Jago Douma | 2016-08-19 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #865 from nextcloud/ocs_config | Morris Jobke | 2016-08-19 | 2 | -0/+18 |
|\ \ \ | |/ / |/| | | Move OCS route /config to proper controller | ||||
| * | | we are Nextcloud :) | Roeland Jago Douma | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| * | | Move /config over to Core OCSController | Roeland Jago Douma | 2016-08-18 | 2 | -0/+18 |
| | | | |||||
* | | | Kill ajax/share.php | Roeland Jago Douma | 2016-08-18 | 2 | -378/+0 |
| |/ |/| | | | | | | | Using this file will insert invalid shares. OCS has to be used exclusively! | ||||
* | | Add cachebuster to apps.css | Lukas Reschke | 2016-08-18 | 1 | -3/+3 |
| | | |||||
* | | Add cachebuster to styles.css | Lukas Reschke | 2016-08-18 | 1 | -8/+8 |
| | | |||||
* | | Add cachebuster to right navigation | Lukas Reschke | 2016-08-18 | 1 | -2/+2 |
| | | |||||
* | | Add cache buster to left menu bar | Lukas Reschke | 2016-08-18 | 1 | -2/+2 |
| | | |||||
* | | Add cache buster to logo | Lukas Reschke | 2016-08-18 | 1 | -2/+2 |
| | | |||||
* | | Revert "Fixing infinite spinning animation on user menu ctrl+click" | Morris Jobke | 2016-08-18 | 1 | -25/+9 |
|/ | |||||
* | Merge pull request #778 from nextcloud/Faldon-user_menu_ui | Morris Jobke | 2016-08-18 | 1 | -9/+25 |
|\ | | | | | Fixing infinite spinning animation on user menu ctrl+click | ||||
| * | Removed debug code. | Faldon | 2016-08-11 | 1 | -1/+0 |
| | | |||||
| * | Fixed user and main menu closing on right mouse button click. | Thomas Pulzer | 2016-08-11 | 1 | -7/+8 |
| | | | | | | | | Fixed wrong variable assignment when trying to open link in new window. | ||||
| * | Changed app and user menu delegates to mousedown events. | Thomas Pulzer | 2016-08-09 | 1 | -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 Pulzer | 2016-08-09 | 1 | -2/+2 |
| | |