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
|
ab70b8c26e
|
Merge branch 'master' into oc_avatars
|
2013-09-01 17:52:13 +02:00 |
|
Christopher
|
36424580b0
|
Merge pull request #4329 from owncloud/fix_4258
Fix #4258 and improve unittest
|
2013-09-01 08:46:27 -07:00 |
|
kondou
|
f44cd944e0
|
Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoadedCallback()
|
2013-09-01 16:04:39 +02:00 |
|
kondou
|
2d6a400381
|
Check for $this->fileInfo and @depend on testData()
|
2013-09-01 15:50:58 +02:00 |
Frank Karlitschek
|
c54994d2e9
|
fixing this obvious typo directly
|
2013-09-01 08:23:11 +02:00 |
|
kondou
|
235638e5ab
|
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
|
2013-08-31 23:48:23 +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 |
|
Frank Karlitschek
|
f1836a997f
|
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
|
2013-08-31 18:14:46 +02:00 |
|
Frank Karlitschek
|
a5633bb155
|
remove the config option that is no longer needed
|
2013-08-31 18:03:10 +02:00 |
|
Frank Karlitschek
|
58e036e304
|
remove knowledgebase calls that are no longer used in ownCloud 5/6
|
2013-08-31 18:00:53 +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 |
|
Thomas Müller
|
92e90c8eb9
|
Merge pull request #4022 from owncloud/oc_preview
\OC\Preview
|
2013-08-31 03:41:29 -07:00 |
Georg Ehrke
|
668c4c2652
|
fix issue with filetable background
|
2013-08-30 22:05:44 +02:00 |
|
kondou
|
0869f9b655
|
Fix #4258, clean up \OC_Image and improve its unittest
|
2013-08-30 21:08:37 +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 |
|
Georg Ehrke
|
40cee5639e
|
use gerMimeTypeDetector detectPath instead of getMimeType
|
2013-08-30 18:07:49 +02:00 |
|
Jenkins for ownCloud
|
dbc78b1a58
|
[tx-robot] updated from transifex
|
2013-08-30 09:38:20 -04:00 |
Stephane Martin
|
95f42d6544
|
Merge pull request #4578 from houbaastef/master
fixes #4574
|
2013-08-30 06:20:07 -07:00 |
|
Jan-Christoph Borchardt
|
1e834c57a4
|
fix issues caused by introduction of sticky Apps management footer
|
2013-08-30 13:46:10 +02:00 |
|
kondou
|
30526ded80
|
Fix \OCP\Avatar
|
2013-08-30 13:26:13 +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 |
petemcfarlane
|
ab1f78eac3
|
prefix 'tbody tr' to separate app/core css errors
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
|
2013-08-30 10:48:04 +01:00 |
|
Arthur Schiwon
|
7d398ba622
|
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
|
2013-08-30 11:45:16 +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 |
|
Morris Jobke
|
0a23ac18bc
|
Merge pull request #4642 from masakik/master
Minor enhancement to console.php
|
2013-08-29 12:05:32 -07:00 |
Masaki
|
04b9e77478
|
replace ident spaces with tabs
|
2013-08-29 15:03:16 -03:00 |
|
Thomas Müller
|
0104d3df96
|
Merge pull request #4592 from owncloud/fix-logic
fix weird logical behaviour
|
2013-08-29 08:40:33 -07:00 |
|
Thomas Müller
|
2cfcf0083f
|
Merge pull request #4643 from owncloud/touch-newfile-hook
also emmit create hook when creating new files using touch()
|
2013-08-29 08:37:46 -07:00 |
|
kondou
|
c533b80682
|
Use OC_Cache and finish cropper functionality
|
2013-08-29 16:56:32 +02:00 |
|
Georg Ehrke
|
728fc7f123
|
fix parameter missing warning
|
2013-08-29 16:13:16 +02:00 |
Robin Appelman
|
1fa29b4c11
|
also emmit create hook when creating new files using touch()
|
2013-08-29 15:31:03 +02:00 |