kondou
|
c9c5e1b97f
|
Merge branch 'master' into oc_avatars
|
2013-09-12 07:41:44 +02:00 |
Thomas Tanghus
|
b7205d97d7
|
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
|
2013-09-11 17:18:04 -07:00 |
Thomas Tanghus
|
80bf1969f9
|
Merge pull request #4784 from owncloud/ocdialog_option_setter
Fix setting ocdialog options after initialization.
|
2013-09-11 12:20:17 -07:00 |
Thomas Tanghus
|
08225a60c8
|
Save two lines
|
2013-09-11 21:15:32 +02:00 |
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 |
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 |
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 |
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 |
Jenkins for ownCloud
|
dbc78b1a58
|
[tx-robot] updated from transifex
|
2013-08-30 09:38:20 -04: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 |