mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,082 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

2138 Commits

Author SHA1 Message Date
Thomas Tanghus 1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +02:00
Thomas Tanghus 7a2b23a036 Fix double destroy on escape. 2013-09-11 17:13:39 +02:00
Pete McFarlane 15be3d85b6 no autoFocus if no users returned 2013-09-11 15:59:28 +01:00
kondou 037cf22c51 Add a comment to clear defaultavatar-functionality 2013-09-11 16:04:41 +02:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +02:00
Jenkins for ownCloud 68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
Pete McFarlane 92b57c13c1 Added autoFocus to #shareWith autocomplete options 2013-09-11 11:45:32 +01:00
kondou bf7f94422f Bring another enable_avatars to $_ and fix $thus->$this 2013-09-11 07:11:33 +02:00
Jörn Friedrich Dreyer cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/js/file-upload.js
 2013-09-10 16:54:48 +02:00
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Thomas Tanghus fdfdd2e4e7 Remove console logging 2013-09-10 00:25:07 +02:00
Thomas Tanghus 51547c3316 Fix setting ocdialog options after initialization. 2013-09-10 00:21:42 +02:00
kondou 1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Jörn Friedrich Dreyer e17c40acb7 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-08 17:31:49 +02:00
Jörn Friedrich Dreyer bd1d5b69fb fix ESC for conflicts dialog 2013-09-08 17:31:12 +02:00
kondou 564de4bc3f Optimize triangle-e.png and triangle-e.svg 2013-09-08 15:18:23 +02:00
Jörn Friedrich Dreyer 0a0410815e close and destroy dialog on ESC 2013-09-08 10:11:35 +02:00
Robin Appelman 00cc83e3f7 show preview for uploading image files on conflict 2013-09-07 14:58:51 +02:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer 02d14aee17 completely remove dialog on cancel/continue 2013-09-06 16:50:45 +02:00
kondou d18a070a03 Have the "notsquare" error as data, not as message 2013-09-06 13:46:50 +02:00
Jörn Friedrich Dreyer 4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
kondou c6ca9c1e9d Use shorter array-conversion 2013-09-06 13:33:17 +02:00
Bart Visscher 4629d6ad67 Merge pull request #4704 from owncloud/rename-lostpassword-controller 
Use the namespaced variation of the classname.
 2013-09-05 14:38:03 -07:00
kondou 3774632ecc Clean up avatars and preliminary use JSON->rawlist.php 2013-09-05 23:12:52 +02:00
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master 
increased version number to trigger db update

Conflicts:
	lib/util.php
 2013-09-05 13:39:45 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
kondou 6db96603a0 Have login-checks and CSRF checks 2013-09-05 00:04:31 +02:00
kondou 8fd76e39cf Use proper controller naming 2013-09-04 22:22:56 +02:00
kondou b643c02bd5 Fix some bugs and remove \OCP\Avatar for now 2013-09-04 22:13:59 +02:00
Thomas Müller 68dce9dde5 fixing style, var name & PHPDoc 2013-09-04 21:22:36 +02:00
Thomas Müller e43e8b0db8 Merge branch 'master' into rename-lostpassword-controller 
Conflicts:
	core/lostpassword/controller.php
 2013-09-04 20:46:32 +02:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
 2013-09-04 14:11:40 +02:00
kondou 820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
kondou a1e7614d73 Clean up oc_avatars 2013-09-04 12:56:14 +02:00
Morris Jobke 09187f3b3b Merge pull request #4449 from owncloud/clean_up_util 
Clean up \OC\Util
 2013-09-03 22:53:03 -07:00
Morris Jobke 6435e18e95 Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker 
Add previews to OC.dialogs.filepicker()
 2013-09-03 22:35:58 -07:00
kondou b1d20e0470 Have the header avatar to the left of the user name 2013-09-03 21:44:32 +02:00
kondou 6d42f51d0c Fix unwanted caching in IE8 2013-09-03 18:34:40 +02:00
kondou ce263df4c7 Don't use HTML5 <header> to support avatars in IE8 2013-09-03 16:52:15 +02:00
Christopher c2eaf7589d Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind 
use on to add event listener instead of deprecated jquery bind
 2013-09-03 06:27:08 -07:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +02:00
Jörn Friedrich Dreyer 85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing 
Texteditor polishing
 2013-09-03 05:38:59 -07:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Bjoern Schiessle fd7469db9e coding-style fixes 2013-09-03 13:37:06 +02:00
Jörn Friedrich Dreyer b0c6f990e4 use on to add event listener instead of deprecated jquery bind 2013-09-03 13:12:19 +02:00
Morris Jobke 84aba4542d Merge pull request #4702 from owncloud/center-utils 
center utils
 2013-09-03 02:27:52 -07:00
Morris Jobke 2da6f6b4ce Merge pull request #4695 from owncloud/placeholder-hsl 
RGB -> HSL
 2013-09-03 02:18:39 -07:00
kondou 65413a95dc Merge branch 'master' into oc_avatars 
Conflicts:
	config/config.sample.php
 2013-09-03 04:43:11 +02:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00
Bart Visscher 5539b9e843 Use the namespaced variation of the classname. 2013-09-02 21:25:32 +02:00
Bernhard Posselt 87035fc478 center utils 2013-09-02 19:38:47 +02:00
Jan-Christoph Borchardt 9eeb27c91a placeholder.js: fix typo 2013-09-02 18:29:16 +02:00
Jan-Christoph Borchardt 57a1219ca0 placeholder.js: adjust saturation and lightness values 2013-09-02 18:20:18 +02:00
Bart Visscher 44b3e71ed4 Cleanup and more style fixes 2013-09-02 18:20:04 +02:00
kondou e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +02:00
Morris Jobke e7a14ea32d RGB -> HSL 2013-09-02 16:41:18 +02:00
Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
Morris Jobke a2f18eabb1 Merge pull request #4657 from owncloud/files-controls-fixes 
Files controls fixes
 2013-09-01 23:08:23 -07:00
Morris Jobke 8a4acf263e Merge pull request #4674 from owncloud/fit-filepicker-new-icons 
Fit filesummary for \OC\Preview's new mimetype-icons
 2013-09-01 23:06:59 -07:00
Morris Jobke 1e501a8521 IE8 fixes 2013-09-02 08:05:47 +02:00
kondou e5fc7b9dbe Merge branch 'master' into clean_up_util 
Conflicts:
	lib/base.php
 2013-09-02 07:58:06 +02:00
Bernhard Posselt f038cb9aea Merge pull request #4671 from owncloud/emptycontent 
centers text message in empty-content page (files and files_trashbin apps)
 2013-09-01 17:47:55 -07:00
kondou 14cc1cd4b8 Pass setLastModifiedHeader() time() 2013-09-01 23:25:50 +02:00
kondou 5c1d64b80e $image doesn't have data() when a defaultavatar should be used 2013-09-01 23:15:45 +02:00
kondou 91fed38f00 Also set an E-Tag header 2013-09-01 23:07:38 +02:00
kondou 44e141cc6a Use \OC_Response for cache invalidation 2013-09-01 21:57:28 +02:00
kondou 74c9223281 Properly check for tmpavatar, invalidate cache, fix debug msgs 2013-09-01 21:17:48 +02:00
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
kondou c95d4cafa9 Fix @tanghus's complains in avatars and clean up cropper after closing with "x" 2013-09-01 19:12:54 +02:00
kondou 76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
Bart Visscher 0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
kondou f44cd944e0 Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback() 2013-09-01 16:04:39 +02:00
kondou 8de9e3d85e Add a description for $.avatar() and remove TODOs @raghunayyar fixed 2013-08-31 23:41:49 +02:00
kondou ebcd2a6b4d Fit filesummary for \OC\Preview's ne mimetype-icons 2013-08-31 19:21:51 +02:00
kondou 385de45ed9 Deal with OC.Router.generate() 2013-08-31 19:05:53 +02:00
kondou aa88eea9cf Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname 2013-08-31 18:27:28 +02:00
Alessandro Cosentino b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Alessandro Cosentino 4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
kondou 5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Georg Ehrke 8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Jan-Christoph Borchardt 0f5df181a3 Merge pull request #4661 from owncloud/separate-app-styles 
Move CSS for apps and browser-specific fixes out of main styles.css
 2013-08-30 09:08:25 -07:00
Bjoern Schiessle 4bbefdf608 add expiration date if it is already set 2013-08-30 17:20:10 +02:00
Bjoern Schiessle e7959f4fd2 don't send mail to the user who shared the file 2013-08-30 16:52:06 +02:00
Bjoern Schiessle 65ddefc89d set sendMail status back to false 2013-08-30 16:29:22 +02:00
Bjoern Schiessle 36574241f8 some clean-up 2013-08-30 16:21:52 +02:00
Bjoern Schiessle 10cf1b3a4e return mailSend status in getItems() 2013-08-30 15:39:43 +02:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
Bjoern Schiessle 77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
kondou 80e10f01c4 Clean up 2013-08-30 13:16:13 +02:00
Morris Jobke bf6981312a Merge pull request #4660 from owncloud/apps-management-sticky 
Apps management as sticky footer and rename to 'Apps', fix #4622
 2013-08-30 03:47:15 -07:00
Arthur Schiwon 22e1f73d5e Use Group methods for searching, fixes #4201 2013-08-30 12:37:46 +02:00
Jan-Christoph Borchardt 9c23ed580a move CSS for browser-specific fixes out of styles.css into new fixes.css 2013-08-30 11:42:32 +02:00
Jan-Christoph Borchardt cc8e19ad11 move CSS for apps out of styles.css into new apps.css 2013-08-30 11:38:49 +02:00
Jan-Christoph Borchardt c9c4ab22a4 Apps management as sticky footer and rename to 'Apps', fix #4622 2013-08-30 11:17:31 +02:00
Jan-Christoph Borchardt a6c7b210db adjust right padding of controls bar, fix #4650 2013-08-30 10:26:41 +02:00
Jan-Christoph Borchardt 3a2534d3bd fix coding style for controls bar 2013-08-30 10:20:39 +02:00
kondou ecf187393b Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests 2013-08-30 09:00:37 +02:00
kondou c533b80682 Use OC_Cache and finish cropper functionality 2013-08-29 16:56:32 +02:00
kondou 0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
Georg Ehrke b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Morris Jobke ea6e74ca95 Merge pull request #4552 from dampfklon/fix4552 
Make group suffix in share dialog translatable
 2013-08-28 15:46:51 -07:00
kondou 0ba498119c Merge branch 'master' into oc_avatars 
Conflicts:
	3rdparty
 2013-08-28 23:21:26 +02:00
Morris Jobke f0ea23891a Merge pull request #4618 from owncloud/visualize-js 
visualize
 2013-08-28 14:17:50 -07:00
Thomas Müller 6502a148ec fixing typo 2013-08-28 23:04:55 +02:00
Morris Jobke 067815099f calculate fontsize and line-height 2013-08-28 21:54:20 +02:00
kondou bdf48a6daa Use OC.Router.generate, TODO use cache, prepare for defaultavatars 2013-08-28 21:20:28 +02:00
Morris Jobke 584857de69 Merge pull request #4627 from owncloud/trashbin-tipsy 
change orientation for delete tooltip to left, fix #4589
 2013-08-28 09:09:40 -07:00
Jan-Christoph Borchardt e7b40983e4 change orientation for delete tooltip to left, fix #4589 2013-08-28 17:58:23 +02:00
Morris Jobke ed2fa06a26 reviewers comments 2013-08-28 16:52:12 +02:00
kondou 67c5be9f19 Merge branch 'master' into oc_avatars 
Conflicts:
	3rdparty
 2013-08-28 16:44:11 +02:00
kondou 8d8a57de7f Continue work on cropper 2013-08-28 16:39:00 +02:00
Morris Jobke 4a00b26029 add visualize 2013-08-28 16:29:27 +02:00
Jan-Christoph Borchardt 0c8ac241df fix shadow style of username input box 2013-08-28 13:59:23 +02:00
Jan-Christoph Borchardt c6eda25d50 remove show password toggle from log in page, ref #4577 #4580 2013-08-28 13:58:49 +02:00
Thomas Tanghus 9843c8e838 Merge pull request #4434 from owncloud/fix_octemplate_escaping 
Fix octemplate string escaping.
 2013-08-28 03:59:43 -07:00
Thomas Tanghus 776d64f804 Cache Object.keys(this.vars) 2013-08-28 12:50:05 +02:00
Jenkins for ownCloud 3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Jenkins for ownCloud d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
kondou 1b45683168 Translate "Permission denied" & use class-autoloader 2013-08-27 12:50:21 +02:00
Morris Jobke ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master 
kill zh_CN.GB2312
 2013-08-27 02:00:48 -07:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller 9909b8b726 adding translations to update events 2013-08-27 00:26:44 +02:00
kondou e6473e6d49 Clean up some cruft 2013-08-26 17:41:19 +02:00
kondou 31736a1df3 Have a controller instead ofo avatar.php and fix some cropper-design 2013-08-26 16:46:55 +02:00
Georg Ehrke 6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Morris Jobke 653bc9a477 Merge pull request #4281 from owncloud/ie8-multiselect 
Better ie8 multiselect
 2013-08-26 02:59:31 -07:00
Morris Jobke 438e816941 Merge pull request #4519 from owncloud/style-fixes 
fix minor style issue in the app navigation
 2013-08-26 00:47:34 -07:00
Morris Jobke ec0808ce75 fix reviewers concerns 2013-08-26 09:44:21 +02:00
Jenkins for ownCloud d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
kondou 81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou 4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou 252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt 
And other small improvements
 2013-08-25 21:04:04 +02:00
kondou 4a08f7d710 Add basic avatars and gravatar 2013-08-25 21:02:43 +02:00
Christopher b8965c6107 Merge pull request #4331 from owncloud/improve_app-management 
Improve app-management
 2013-08-25 11:56:56 -07:00
Jenkins for ownCloud 596ac40b7f [tx-robot] updated from transifex 2013-08-23 20:17:08 -04:00
Georg Ehrke 6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
dampfklon 87c3f34a93 Make group suffix in share dialog translatable 2013-08-22 19:52:08 +02:00
Jenkins for ownCloud 02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Jörn Friedrich Dreyer 7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +02:00
kondou 0ce35af02a Merge branch 'master' into improve_app-management 
Conflicts:
	settings/js/apps.js
 2013-08-21 19:20:25 +02:00