kondou
|
74c9223281
|
Properly check for tmpavatar, invalidate cache, fix debug msgs
|
2013-09-01 21:17:48 +02: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
|
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 |
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 |
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 |