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

1958 commits

Author SHA1 Message Date
kondou
ce263df4c7 Don't use HTML5 <header> to support avatars in IE8 2013-09-03 16:52:15 +02:00
kondou
65413a95dc Merge branch 'master' into oc_avatars 
Conflicts:
	config/config.sample.php
 2013-09-03 04:43:11 +02:00
kondou
e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +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
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
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
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