summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* allow to share a file/folder as public link also if one of it parents was ↵Bjoern Schiessle2013-10-301-2/+4
| | | | already shared as link
* Fixed group management dropdown in IE9Vincent Petry2013-10-271-3/+3
| | | | | | | | There is a syntax error in the "em" tag that isn't close that seem to mess up in IE9. - Fix was found in 0bcb0439 for multiselect.js, so backported this partially. - Fixes #2569
* Fixed sharing status update for new/uploaded filesVincent Petry2013-10-171-39/+58
| | | | | | | | | | | | | | Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977 Backport of 70c9652cdf6e00f1c62fb9a61d9dd4fb3e2c93c3
* find users which are in the same groupBjoern Schiessle2013-10-081-1/+1
|
* Fix autofocusMorris Jobke2013-10-071-2/+4
| | | | | | fix #4465 fix #4941 backport of 4803 to stable5
* introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-301-1/+1
| | | | | | Conflicts: core/templates/login.php lib/util.php
* don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-301-0/+2
| | | | | | | | needs to log-in again in order to decrypt his private key with his password Conflicts: core/templates/login.php lib/util.php
* Merge pull request #4948 from owncloud/fix-inputfieldsVicDeo2013-09-261-1/+0
|\ | | | | fix visual glitch, do not use black border for input fields
| * fix visual glitch, do not use black border for input fieldsJan-Christoph Borchardt2013-09-231-1/+0
| |
* | we can leave the loop if the permission of the link share was checkedBjoern Schiessle2013-09-261-3/+1
| |
* | check only permission from link-share to decide if public upload is enabled ↵Bjoern Schiessle2013-09-261-1/+3
| | | | | | | | or disabled
* | initialize variableBjoern Schiessle2013-09-231-0/+1
| |
* | calculate correct permissions while toggle the password protectionBjoern Schiessle2013-09-231-1/+11
|/
* Improve IE CompatibilityJörn Friedrich Dreyer2013-09-111-1/+2
| | | | Added meta tags from HTML5 Boiler Plate to improve compatibility with IE7+. This fixes the issues with rendering.
* Merge pull request #4633 from owncloud/backport-4610-stable5Raghu Nayyar2013-08-303-5/+12
|\ | | | | Backport 4610 to stable5
| * fix shadow style of username input boxJan-Christoph Borchardt2013-08-291-0/+10
| | | | | | | | | | Conflicts: core/css/styles.css
| * remove show password toggle from log in page, ref #4577 #4580Jan-Christoph Borchardt2013-08-292-5/+2
| | | | | | | | | | Conflicts: core/js/js.js
* | WhitespacesArthur Schiwon2013-08-211-2/+2
| |
* | Use Group methods for searching, fixes #4201Arthur Schiwon2013-08-211-6/+5
|/
* Merge pull request #4454 from owncloud/fix_4446Kondou2013-08-171-0/+1
|\ | | | | Show a "password incorrect" notice when used shared password is wrong
| * Style the new 'password wrong' div conservatively.Owen Winkler2013-08-161-0/+1
| |
* | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-151-3/+3
|/
* Merge pull request #4240 from owncloud/backport-remember-checkedThomas Müller2013-08-041-1/+1
|\ | | | | Backport remember checked
| * check remember log in by default, manual backport of #4175Jan-Christoph Borchardt2013-07-301-1/+1
| |
* | use fixed OC.Breadcrumb.push()Jörn Friedrich Dreyer2013-08-021-1/+39
| | | | | | | | | | Conflicts: core/js/js.js
* | fixes #4026Thomas Müller2013-07-301-9/+21
|/
* Show generic error when there is no errorVictor Dubiniuk2013-07-241-1/+6
|
* Create an array entry before filling itVictor Dubiniuk2013-07-241-0/+1
|
* Squashed commit of the following:Thomas Müller2013-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 7e875ff47ae1a3e546c74fb12895b2bfbeedabdf Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Sun Jul 14 21:58:08 2013 +0200 No admin option to enable public upload in case encryption is enabled No upload on pubic page if public upload is disabled commit 4939d9a668c13cdd74e8bb8e305bdd7a59661c4d Author: Thomas Mueller <thomas.mueller@tmit.eu> Date: Fri Jul 12 21:34:38 2013 +0200 change anonymous to public commit c3bda8654d911383ae0acf9e41adda7117cb79f8 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 12 17:51:01 2013 +0200 fixing Undefined index: publicUploadEnabled commit 98861afde443c12a2ef5290c83c63fd12b7b196d Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 12 17:05:58 2013 +0200 in case the encryption app is enabled we cannot yet allow anonymous upload commit 974f09629d0e8bf5d90cf8546fa4a82738ebdebe Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 12 17:03:51 2013 +0200 new admin setting added which allows to turn off anonymous uploads
* deactivate show password toggle for IEJan-Christoph Borchardt2013-07-201-0/+16
| | | | | | Conflicts: core/css/styles.css
* Merge pull request #4047 from owncloud/backport_3617blizzz2013-07-181-103/+28
|\ | | | | Backport 3963
| * Rerename \OC\Updater to OC_Updater, fixes broken admin pageArthur Schiwon2013-07-171-8/+8
| |
| * Stable5 adjustements (incl copy of lib/hooks/ from master) to make backport ↵Arthur Schiwon2013-07-121-3/+2
| | | | | | | | of #3963 work
| * backport: split upgrade logic from ajax fileRobin Appelman2013-07-121-101/+27
| | | | | | | | | | | | Conflicts: core/ajax/update.php lib/updater.php
* | Ie8 specific multiselectVictor Dubiniuk2013-07-121-1/+9
|/
* update.php: remove event type 'error' as it's unusedThomas Müller2013-07-112-10/+4
| | | | eventsource.js: fixing typos and JSDoc comment
* missing fileThomas Müller2013-07-111-1/+3
|
* - eventsource.php: in case of potential CSRF attack we send an error message ↵Thomas Müller2013-07-112-2/+9
| | | | | | | | from the EventSource to the browser - eventsource.js: handle undefined data on event - update.js: in case of error we close the event source - advise the user to reload the page - update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
* Fix lazy styles loading in IE8Victor Dubiniuk2013-07-091-2/+6
|
* Backport of #3948 to stable5Thomas Müller2013-07-051-2/+2
|
* no anonymous upload on read-only foldersThomas Müller2013-07-051-9/+11
|
* Merge pull request #3931 from owncloud/backport_selectRangeJörn Friedrich Dreyer2013-07-041-0/+20
|\ | | | | Fixing renaming for stable5
| * Add selectRange functionVictor Dubiniuk2013-07-041-0/+20
| |
* | move to non-static OC_DefaultsBjörn Schießle2013-07-033-9/+9
| |
* | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-033-0/+9
|/
* Public upload featureRoman Geber2013-07-011-1/+42
| | | | | Conflicts: apps/files/js/filelist.js
* Merge pull request #3863 from owncloud/improved_footerBjörn Schießle2013-07-012-11/+4
|\ | | | | Improved footer
| * add logo claim to defaults.phpBjörn Schießle2013-06-282-6/+2
| |
| * construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-06-261-5/+2
| |
* | Escape dropdownLukas Reschke2013-06-291-2/+2
| | | | | | | | Fixes #3241