wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
34571 commits 157 branches 562 tags 714 MiB
Commit graph

5809 commits

Author SHA1 Message Date
Arthur Schiwon
44f3fcc187
fix internal links in security & setup warnings, resolves #1048 2016-08-25 13:24:50 +02:00
Lukas Reschke
593f2f638e
Add cachebuster to icons.css 2016-08-24 20:59:17 +02:00
Christoph Wurst
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass 
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.
 2016-08-24 10:49:23 +02:00
Joas Schilling
736e884e9a
Move the reset token to core app 2016-08-23 15:01:38 +02:00
Joas Schilling
139fb8de94
Remove "password reset token" after successful login 2016-08-23 12:54:45 +02:00
Lukas Reschke
e0ae67545e Merge pull request #956 from nextcloud/fix_952 
When using permalinks don't error out if file id can't be found
 2016-08-23 00:58:25 +02:00
Roeland Jago Douma
fc6e8bdf3f Merge pull request #1000 from nextcloud/mail_icon_share 
Make e-mail icon visible
 2016-08-22 09:13:56 +02:00
Roeland Jago Douma
4cc908bf9b
Make e-mail icon visible 
Fixes #996

* Make mail icon visible
* Opacity to .5
* Add tooltip
 2016-08-21 14:37:08 +02:00
Roeland Jago Douma
555ea93b1c
Fix some jshint issues in core/js/share* 2016-08-19 21:03:25 +02:00
Lukas Reschke
8a6b5a1d86
Remove uninterpreted PHP 
This is in an HTML file. The PHP won't be executed 🙈
 2016-08-19 14:24:26 +02:00
Lukas Reschke
365797d4b4 Merge pull request #964 from nextcloud/master-aedae12db5ebfaf56bec91b736fb8a569cecf16f 
[master] In cases where the server dictates the link share expiration…
 2016-08-19 12:16:56 +02:00
Marius Blüm
91e8b33ca2 Merge pull request #959 from nextcloud/map_mobi 
Update mimetypes
 2016-08-19 11:21:53 +02:00
Thomas Pulzer
58f9340d93 Fixing infinite spinner animation 
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
 2016-08-19 10:50:51 +02:00
Thomas Müller
497ae34e88
[master] In cases where the server dictates the link share expiration the date is not updated on consequitive changes and enable/disable actions 2016-08-19 10:24:52 +02:00
Roeland Jago Douma
a774efb0f9
Update mimetypes 2016-08-19 09:55:38 +02:00
Morris Jobke
3ccd69707e Merge pull request #865 from nextcloud/ocs_config 
Move OCS route /config to proper controller
 2016-08-19 09:39:05 +02:00
Roeland Jago Douma
54f79a28f6
When using permalinks don't error out if file id can't be found 
Fixes #952

* Use only the index route (since it went to showFile anyways)
* Fix tests
* Use getUserFolder to force init of users mounts
 2016-08-19 08:15:30 +02:00
Roeland Jago Douma
532c0dd8ce
Kill ajax/share.php 
Using this file will insert invalid shares.
OCS has to be used exclusively!
 2016-08-18 20:56:02 +02:00
Lukas Reschke
f42d3ac9ec
Add cachebuster to apps.css 2016-08-18 12:38:14 +02:00
Lukas Reschke
16521bfd7b
Add cachebuster to styles.css 2016-08-18 12:37:22 +02:00
Lukas Reschke
fb183f8143
Add cachebuster to right navigation 2016-08-18 12:36:14 +02:00
Lukas Reschke
3c7d2544b9
Add cache buster to left menu bar 2016-08-18 12:34:55 +02:00
Lukas Reschke
e5827798a1
Add cache buster to logo 2016-08-18 12:30:49 +02:00
Morris Jobke
8e08b8c04e Revert "Fixing infinite spinning animation on user menu ctrl+click" 2016-08-18 11:46:00 +02:00
Roeland Jago Douma
0963397cb8
we are Nextcloud :) 2016-08-18 09:37:11 +02:00
Roeland Jago Douma
6bc1c6590c
Move /config over to Core OCSController 2016-08-18 09:37:09 +02:00
Morris Jobke
3e7710c0d8 Merge pull request #778 from nextcloud/Faldon-user_menu_ui 
Fixing infinite spinning animation on user menu ctrl+click
 2016-08-18 08:40:13 +02:00
Morris Jobke
bded787d0c
Empty tags are not allowed for image and feColorMatrix in IE11 and below 2016-08-17 15:59:30 +02:00
Roeland Jago Douma
ba4633b165
Add viewBox to app icons 
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
 2016-08-17 15:23:51 +02:00
Marius Blüm
c1632c3abd Merge pull request #893 from nextcloud/ie8_be_gone 
IE8 be gone!
 2016-08-17 09:02:58 +02:00
Nextcloud bot
0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Roeland Jago Douma
0cb8f74cd1
Delete IE8 support in the avatar controller 2016-08-16 20:48:04 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +02:00
Nextcloud bot
8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Nextcloud bot
f3124b5052
[tx-robot] updated from transifex 2016-08-15 00:12:16 +00:00
Jan-Christoph Borchardt
c8113a4269
compress images and fix position 2016-08-13 14:03:56 +02:00
Frank Karlitschek
629c3dd39f
adding social buttons 2016-08-13 14:03:56 +02:00
Nextcloud bot
4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Lukas Reschke
11e089f112 Merge pull request #844 from nextcloud/twofactor_mw_excep 
TwoFactorMiddleware should forward Exception
 2016-08-12 20:15:32 +02:00
Morris Jobke
4a887d851e Merge pull request #837 from nextcloud/when-logged-in-then-just-redirect-to-redirected-page 
When logged in then just redirect to redirected page
 2016-08-12 14:21:36 +02:00
Roeland Jago Douma
33f1532079
Throw exception if you don't handle it 2016-08-12 14:04:23 +02:00
Nextcloud bot
35358bdde0
[tx-robot] updated from transifex 2016-08-12 00:10:18 +00:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Faldon
14bf180837 Removed debug code. 2016-08-11 16:43:07 +02:00
Lukas Reschke
9ca25e857c
Redirect users when already logged-in on login form 2016-08-11 15:22:29 +02:00
Thomas Pulzer
b2b7fa4854 Fixed user and main menu closing on right mouse button click. 
Fixed wrong variable assignment when trying to open link in new window.
 2016-08-11 07:22:13 +02:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Roeland Jago Douma
ba922c9f73 Merge pull request #807 from nextcloud/ocs_dataresponse 
OCSController requires DataResponse
 2016-08-10 22:36:25 +02:00
Roeland Jago Douma
9544c97ffe
Fix Core's OCSController response 2016-08-10 20:53:13 +02:00
Thomas Müller
4cf2f97a16
Add missing array element - fixes #25714 2016-08-10 11:11:23 +02:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex 2016-08-10 00:09:59 +00:00
Morris Jobke
93047f5e4d Merge pull request #777 from nextcloud/ocs_capabilities 
Move /cloud/capabilities and /cloud/user to Core
 2016-08-10 00:43:13 +02:00
Lukas Reschke
7e23351bf0 Merge pull request #677 from nextcloud/app-menu-fix 
Fix closing app menu on mobile
 2016-08-10 00:28:04 +02:00
Lukas Reschke
2b04b58d9a Merge pull request #783 from nextcloud/app-disable-yellow 
make disabled apps more clear during upgrade
 2016-08-10 00:24:02 +02:00
Roeland Jago Douma
69da896785
Move /cloud/user to Core app 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
02449c8336
Move getCapabilities over to Core 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
575875e8d0
Allow OCS routes in Core and Settings 2016-08-09 20:56:31 +02:00
Roeland Jago Douma
7a4e5d8f40
Open exiration date picker directly on toggle 2016-08-09 19:55:58 +02:00
Arthur Schiwon
ceeb44bd04
Initial work on Apps page split: 
* interfaces for the Admin settings (IAdmin) and section (ISection)
* SettingsManager service
* example setup with LDAP app
 2016-08-09 18:05:09 +02:00
Robin Appelman
e783006fe2 make disabled apps more clear during upgrade 2016-08-09 13:46:41 +02:00
Thomas Pulzer
c5033670d5
Changed app and user menu delegates to mousedown events. 
Added proper handling of primary mouse button click with and without ctrl-/meta-key modifier.
Added handlig of middle mouse button click.
 2016-08-09 11:58:32 +02:00
Thomas Pulzer
8c9961aa22
Added OS X meta key check for stopping spinning animation in app and user menu. 2016-08-09 11:58:32 +02:00
Thomas Pulzer
1ab9477ac1
Fixed user menu to not show spinner on ctrl+click. 
Fixes #616
 2016-08-09 11:58:32 +02:00
Morris Jobke
4277051442 Merge pull request #660 from gdamjan/custom-config-dir 
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300)
 2016-08-09 10:58:23 +02:00
Nextcloud bot
3a26def7cf
[tx-robot] updated from transifex 2016-08-09 00:10:11 +00:00
Lukas Reschke
fa352a81a5 Merge pull request #728 from nextcloud/update-styling 
Design fixes for updates
 2016-08-08 11:23:31 +02:00
Nextcloud bot
344916de15
[tx-robot] updated from transifex 2016-08-07 00:10:23 +00:00
Nextcloud bot
b80e3e70e5
[tx-robot] updated from transifex 2016-08-06 00:10:17 +00:00
Roeland Jago Douma
dd44624540 Merge pull request #732 from nextcloud/fix-shipped.json 
Order alphabetically and deduplicate the shipped.json
 2016-08-05 15:11:28 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Joas Schilling
89cb7b59f8
Order alphabetically and deduplicate the shipped.json 2016-08-04 14:40:43 +02:00
Lukas Reschke
966e2d8dde [master] Add new apps as official 2016-08-04 14:15:42 +02:00
Jan-Christoph Borchardt
835dc59d6a reduce info on update screens, introduce button to refresh 2016-08-04 12:48:25 +02:00
Joas Schilling
dab0a6223a Merge pull request #718 from jurgenhaas/patch-1 
Exit from upgrade without reporting error
 2016-08-04 09:04:24 +02:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Jan-Christoph Borchardt
2f9725469d switch nested containers in update to semibold style 2016-08-03 18:58:44 +02:00
Jürgen Haas
aeb5dfa4ac Exit from upgrade without reporting error 
As reported at https://help.nextcloud.com/t/silent-mode-for-occ-upgrade/2120 we should exit with a return value of 0 (zero) if the current instance is already up to date so that automatic deployment tools don't recognize that as an error.
 2016-08-03 15:51:55 +02:00
Joas Schilling
d1d891fed0
Add access control and automated tagging as shipped 2016-08-03 14:47:52 +02:00
Vincent Petry
0f3674a446
Group incoming shares for resharing in JS 2016-08-03 10:16:28 +02:00
Damjan Georgievski
4d559267bd SetupController should use \OC::$configDir too 2016-08-02 15:28:19 +02:00
Morris Jobke
d97fe1775a
Shake the login fields if password is wrong 2016-08-01 21:42:29 +02:00
Morris Jobke
32e5e48b0b Merge pull request #653 from nextcloud/animate-sidebar 
slight animation for the sidebar for better feedback what happens
 2016-08-01 18:21:31 +02:00
Morris Jobke
ffd29e9ec5 Merge pull request #672 from sndrr/occ-rebrand-to-nextcloud 
Occ rebrand to nextcloud
 2016-08-01 11:15:22 +02:00
Nextcloud bot
8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Julius Haertl
6b807af619
Fix closing app menu on mobile 2016-07-31 11:57:03 +02:00
Nextcloud bot
2a2526e1d1
[tx-robot] updated from transifex 2016-07-31 00:09:54 +00:00
Julius Haertl
217b52085d
Fix javascript tests for sidebar animation 2016-07-30 16:30:05 +02:00
Sander Ruitenbeek
06fd2e7d5a Revert (c) back to ownCloud, Inc. 
To be dealt with later
 2016-07-30 16:26:34 +02:00
Julius Haertl
fdcba04c98
Add animation to app-content 2016-07-30 16:24:04 +02:00
sanderr
a7f998a454 Update Upgrade.php 2016-07-30 15:09:43 +02:00
Sander Ruitenbeek
3101f9e234 Rebranded to Nextcloud for the occ command line tool 2016-07-30 15:39:32 +02:00
Marius Blüm
3b386af295 Merge pull request #664 from nextcloud/white-app-menu-fix 
Fix wrong preserveAspectRatio at app menu icons
 2016-07-30 09:11:19 +02:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Julius Haertl
9f50838cff
Fix wrong preserveAspectRatio at app menu icons 2016-07-29 23:06:26 +02:00
Björn Schießle
3728479beb Merge pull request #627 from nextcloud/white-app-menu 
Change app menu to white background with dark icons
 2016-07-29 20:24:24 +02:00
Jan-Christoph Borchardt
5d0f9dabf6 fix shading of apps icon in app menu 2016-07-29 15:48:05 +02:00
Jan-Christoph Borchardt
fe8d13c935 slight animation for the sidebar for better feedback what happens 2016-07-29 12:08:12 +02:00
Roeland Jago Douma
41d044cf89 Merge pull request #630 from nextcloud/enoch85-patch-1 
ownCloud -> Nextcloud
 2016-07-29 10:55:47 +02:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Julius Haertl
f55ba62a00
Move to svg filter on app menu to support IE9+ 2016-07-28 22:33:17 +02:00
Jan-Christoph Borchardt
319449434e
adjust opacity of icons in apps and user menu 2016-07-28 20:56:49 +02:00
Julius Haertl
21bb05ca7e
Change app menu to white 2016-07-28 20:56:39 +02:00
Daniel Hansson
0b4789b162 ownCloud -> Nextcloud 2016-07-28 20:55:26 +02:00
Daniel Hansson
bbc7c0f3dd ownCloud -> Nextcloud 2016-07-28 15:47:04 +02:00
Jan-Christoph Borchardt
9ebd0914b7 Merge pull request #415 from nextcloud/theming-colorize-checkboxes 
Colorize checkboxes depending on theming color
 2016-07-28 11:12:39 +02:00
Nextcloud bot
ffa25ff74d
[tx-robot] updated from transifex 2016-07-28 00:11:51 +00:00
Julius Haertl
217b02aaa0
Theming: Cleanup and remove opacity from checkbox/radiobutton 2016-07-27 20:21:53 +02:00
Julius Haertl
7ff19e342e
Theming: Colorize radio buttons and append new styles on preview 2016-07-27 20:00:23 +02:00
Julius Haertl
9ebe0c8d64
Colorize checkboxes depending on theming color 2016-07-27 19:45:57 +02:00
Morris Jobke
638f852ed8 Merge pull request #571 from nextcloud/no-missing-preview 
Don't try to load previews when we know there is none
 2016-07-27 15:48:40 +02:00
Robin Appelman
03c17ff614 dont load filelist previews if we know we dont have one 2016-07-27 12:59:43 +02:00
Bjoern Schiessle
4ecd16c555
Redirect to default page after login 2016-07-27 12:11:58 +02:00
Joas Schilling
318d68a9a9 Merge pull request #565 from nextcloud/workflowengine 
Add workflowengine
 2016-07-27 10:07:20 +02:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Morris Jobke
2f42a3fc31
Add workflowengine 2016-07-26 11:16:34 +02:00
Joas Schilling
cc5ddcf537 Merge pull request #525 from nextcloud/fix-theme-logo-position 
Fix theme logo position and shape
 2016-07-26 10:46:13 +02:00
Nextcloud bot
31e807b155
[tx-robot] updated from transifex 2016-07-26 00:09:19 +00:00
Julius Haertl
d58ff68531
Theming: Fix preview and center alignment of logo 2016-07-25 18:54:13 +02:00
Joas Schilling
4ad0c383ad Merge pull request #523 from Faldon/master 
Renamed file logging
 2016-07-25 11:41:24 +02:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Jan-Christoph Borchardt
dd1a5b9ac3 Fix search box overlapping on mobile (#450) 
* fix searchbox overlapping on mobile

* also adjust log in background color in theme

* Fix unit tests
 2016-07-22 15:38:37 +02:00
Jos Poortvliet
642f59e159 Update header.css 
make the logo look good on the login page
 2016-07-22 14:23:00 +02:00
Thomas Pulzer
ba3f4f118e Changed logtype to file instead of owncloud. 
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
  Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
  Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'

- Adjusted tests for the new file log.

Closes #490.
 2016-07-22 11:44:19 +02:00
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00:00
Morris Jobke
8c7d7d7746 Merge pull request #507 from nextcloud/run-le-script 
Update emails and license headers with latest changes
 2016-07-21 23:27:15 +02:00
William Bargent
6da54a6987 Merge pull request #374 from lpszBuffer/master 
Alters 'No Internet Connection' error message. #181
 2016-07-21 18:55:58 +01:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
ba87db3fcc
Fix others 2016-07-21 18:13:57 +02:00
Derek
b236100619 Alters 'No Internet Connection' error message. #181 2016-07-20 19:12:10 -05:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Lukas Reschke
c385423d10 Merge pull request #479 from nextcloud/add-bruteforce-throttler 
Implement brute force protection
 2016-07-21 00:31:02 +02:00
Lukas Reschke
c1589f163c
Mitigate race condition 2016-07-20 23:09:27 +02:00
Lukas Reschke
ba4f12baa0
Implement brute force protection 
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
 2016-07-20 22:08:56 +02:00
Lukas Reschke
020a2a6958 Merge pull request #476 from nextcloud/port-same-site-cookies 
[master] Port Same-Site Cookies to master
 2016-07-20 21:35:02 +02:00
Roeland Douma
1088916eda Merge pull request #390 from nextcloud/occ-user 
More occ user management commands
 2016-07-20 20:36:33 +02:00
Roeland Douma
9f219f55f2 Merge pull request #467 from nextcloud/use-clipboard-api 
Use clipboard api
 2016-07-20 20:11:08 +02:00
Lukas Reschke
a299fa38a9
[master] Port Same-Site Cookies to master 
Fixes https://github.com/nextcloud/server/issues/50
 2016-07-20 18:37:57 +02:00
Morris Jobke
032e6b1701 Merge pull request #473 from nextcloud/ux-improvement-share-dialog 
only show additional edit permissions for folders
 2016-07-20 18:34:55 +02:00
Bjoern Schiessle
77d2338bd2
only show additional edit permissions for folders 2016-07-20 15:24:51 +02:00
Thomas Müller
4d67429cf0
Use an icon to set the email instead of a button with string 2016-07-20 15:07:46 +02:00
Thomas Müller
daaa3ded8d
Add clipboard button to public share link 2016-07-20 15:07:41 +02:00
Joas Schilling
45c99c226b
Fix the HTML encoding when uploading a folder in FF when using french l10n 2016-07-20 13:03:27 +02:00
Joas Schilling
5632cb9a3b
Remove pre-fork EE apps from shipped.json 2016-07-20 11:19:55 +02:00
Nextcloud bot
78e0bdc003
[tx-robot] updated from transifex 2016-07-20 00:09:13 +00:00
Robin Appelman
586c58efa7
add occ command to show user information 2016-07-19 09:58:59 +02:00
Robin Appelman
3d874c407d
Add commands to add/remove users to/from groups 2016-07-19 09:58:59 +02:00
Robin Appelman
413d577b29
add command to list groups 2016-07-19 09:58:59 +02:00