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 |
Jenkins for ownCloud
|
a89199cc7b
|
[tx-robot] updated from transifex
|
2013-08-21 08:14:27 -04:00 |
Christopher
|
90da518e3e
|
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
|
2013-08-20 12:45:10 -07:00 |
kondou
|
f1518a54df
|
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
|
2013-08-20 17:20:30 +02:00 |
Jenkins for ownCloud
|
e9644c2f52
|
[tx-robot] updated from transifex
|
2013-08-19 15:14:38 -04:00 |
Morris Jobke
|
9e5b721a0d
|
fix minor style issue in the app navigation
|
2013-08-19 15:42:51 +02:00 |
Georg Ehrke
|
d9e8ebabdc
|
outsource sharing and deleted files previews to apps
|
2013-08-19 13:24:07 +02:00 |
Georg Ehrke
|
48f0c54261
|
style fixes for preview lib
|
2013-08-19 12:16:55 +02:00 |
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
Thomas Müller
|
0890a915b3
|
adding file templates for ods, odt and odp
|
2013-08-18 21:11:11 +02:00 |
kondou
|
7c296a6cf9
|
Move .errormsg from settings-css to .warning in core. Reusable!
|
2013-08-18 17:37:22 +02:00 |
Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
Kondou
|
141d2f67aa
|
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
fixing error page layout
|
2013-08-18 06:46:48 -07:00 |
Owen Winkler
|
1793ec1d5d
|
Fixed inconsistent spacing.
|
2013-08-18 05:17:28 -04:00 |
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
kondou
|
65d802329f
|
Fix some naming and spacing in lib/util.php
|
2013-08-18 10:33:09 +02:00 |
Thomas Müller
|
3d760222d4
|
fixing error page layout
|
2013-08-18 10:30:21 +02:00 |
kondou
|
edd92e4c09
|
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
|
2013-08-18 00:38:52 +02:00 |
Thomas Müller
|
15c9a0f405
|
fixing undefined js error
|
2013-08-17 19:24:06 +02:00 |
Thomas Müller
|
12f4494de0
|
Merge pull request #4339 from owncloud/mimetype-defaults
Add the option to provide templates for newly created files
|
2013-08-17 08:42:49 -07:00 |
Kondou
|
a1128aadd0
|
Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
Remove cancel button from filepicker
|
2013-08-17 06:58:34 -07:00 |
Morris Jobke
|
3e88430840
|
Merge pull request #4475 from owncloud/brighter-font-color
change font on login/install page from black to white
|
2013-08-17 04:37:49 -07:00 |
Thomas Müller
|
69350c4e0d
|
Merge pull request #4471 from owncloud/password-icon
use proper password icon, three dots are 'more'
|
2013-08-17 03:16:11 -07:00 |
Thomas Müller
|
264ee9df9a
|
Merge pull request #4476 from owncloud/doc-on-master
fix difference between packaged version and master
|
2013-08-17 03:13:17 -07:00 |
kondou
|
2ee8425295
|
Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
|
2013-08-17 12:07:58 +02:00 |
Morris Jobke
|
60efd93d5d
|
fixes for IE8
|
2013-08-17 11:56:52 +02:00 |
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
Morris Jobke
|
746d32eb05
|
fix difference between packaged version and master
|
2013-08-17 10:33:11 +02:00 |
Morris Jobke
|
18769e1348
|
change font on login/install page from black to white
|
2013-08-17 10:26:30 +02:00 |
Jan-Christoph Borchardt
|
b8b24bbae7
|
use proper password icon, three dots are 'more'
|
2013-08-16 17:59:48 +02:00 |
Jörn Friedrich Dreyer
|
5b8d30c6b6
|
refactor OC.Breadcrumbs, allow injection of container to allow rendering crumbs into full screen editor
|
2013-08-16 17:20:49 +02:00 |
Jörn Friedrich Dreyer
|
f94e603698
|
progress fixes
|
2013-08-16 11:40:55 +02:00 |
Jan-Christoph Borchardt
|
1e8849b04e
|
Merge pull request #4314 from owncloud/css-fixes
Design fixes
|
2013-08-16 01:05:29 -07:00 |
Morris Jobke
|
c196985ea3
|
Merge pull request #4032 from owncloud/more-whitespace
More whitespace
|
2013-08-16 01:02:03 -07:00 |
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
Jörn Friedrich Dreyer
|
4588efc44b
|
add triangle icon east
|
2013-08-16 02:48:45 +02:00 |
Thomas Müller
|
0aa7dc9b89
|
tixing width and position of wider error messages
|
2013-08-16 00:56:09 +02:00 |
Jan-Christoph Borchardt
|
d2767faf61
|
Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
|
2013-08-15 15:31:42 -07:00 |
Jan-Christoph Borchardt
|
399adf67b0
|
merge master into css-fixes
|
2013-08-16 00:29:43 +02:00 |
Thomas Müller
|
7279a07ca2
|
Merge branch 'master' into mimetype-defaults
Conflicts:
apps/files/ajax/newfile.php
|
2013-08-16 00:13:10 +02:00 |
Jan-Christoph Borchardt
|
b632b8f4e4
|
force show loading icon also for IE
|
2013-08-16 00:02:11 +02:00 |
Jan-Christoph Borchardt
|
3563eecfff
|
merge master into more-whitespace
|
2013-08-15 23:25:20 +02:00 |
Thomas Müller
|
bd1895bdf8
|
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-15 14:08:01 -07:00 |
Jan-Christoph Borchardt
|
61370a7655
|
add folder icons for shared, public and external
|
2013-08-15 18:58:55 +02:00 |
Morris Jobke
|
5fb7aab7a0
|
remove jPlayer css rules from core css file
|
2013-08-15 16:08:49 +02:00 |
kondou
|
9c5416fe4a
|
Clean up \OC\Util
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
|
2013-08-15 15:57:32 +02:00 |
Thomas Müller
|
ada13a4d40
|
fixing all broken translation files
|
2013-08-15 15:41:45 +02:00 |
Jan-Christoph Borchardt
|
2fd5178a00
|
adjust New file dialog for new styles
|
2013-08-15 12:50:26 +02:00 |
Jenkins for ownCloud
|
680ac48856
|
[tx-robot] updated from transifex
|
2013-08-15 04:53:54 -04:00 |
Thomas Tanghus
|
ca495758bd
|
Fix octemplate string escaping.
|
2013-08-14 23:06:43 +02:00 |
Thomas Müller
|
06670cef8a
|
Merge pull request #4304 from tripflex/lostpw-themed
use theme name and title for password reset
|
2013-08-14 12:04:40 -07:00 |
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
Jan-Christoph Borchardt
|
cba0f69622
|
increase row height to 50px, properly position everything, checkboxes, actions etc
|
2013-08-14 20:41:20 +02:00 |
Jörn Friedrich Dreyer
|
8f3f47e868
|
Merge pull request #4376 from owncloud/use_plurals
Use plural translations
|
2013-08-14 10:23:19 -07:00 |
Jörn Friedrich Dreyer
|
9da49264ea
|
change filelist ui updates
|
2013-08-14 17:49:45 +02:00 |
Jan-Christoph Borchardt
|
79a5e2a4cc
|
adjustments of video and web icon
|
2013-08-14 13:51:55 +02:00 |
Jan-Christoph Borchardt
|
4845ef5ac6
|
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
|
2013-08-14 13:01:52 +02:00 |
Jan-Christoph Borchardt
|
14003b6d96
|
replace different icons for code with proper ones
|
2013-08-14 13:00:13 +02:00 |
Jan-Christoph Borchardt
|
fc23649fa1
|
replace different icons for documents, spreadsheets and presentations with proper ones
|
2013-08-14 12:43:42 +02:00 |
Jan-Christoph Borchardt
|
5abf6ddea4
|
replace same but differently named package graphics with one proper one
|
2013-08-14 12:36:31 +02:00 |
Jan-Christoph Borchardt
|
20855add94
|
add more file type icons, replace old ones
|
2013-08-14 12:33:41 +02:00 |
Georg Ehrke
|
f9b2815767
|
remove \OC\Preview::showErrorPreview
|
2013-08-14 12:21:27 +02:00 |
Jörn Friedrich Dreyer
|
e1927d5bee
|
fix whitespace, check selected files before starting upload
|
2013-08-14 10:55:12 +02:00 |
Jörn Friedrich Dreyer
|
435e63b5ee
|
Merge pull request #4410 from owncloud/fix_sharing_defaults
Fix sharing defaults
|
2013-08-13 15:27:24 -07:00 |
Jörn Friedrich Dreyer
|
11a404b90b
|
comment clarification
|
2013-08-14 00:25:07 +02:00 |
Jörn Friedrich Dreyer
|
ca95a475d5
|
use edit & reshare permission as default
|
2013-08-13 22:58:47 +02:00 |
Jörn Friedrich Dreyer
|
5660f99592
|
add PERMISSIONS_ALL summary
|
2013-08-13 22:58:27 +02:00 |
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |