Bart Visscher
|
d0bd2bbf27
|
Convert menu entries of settings pages to use router
|
2012-09-28 23:20:17 +02:00 |
|
Bart Visscher
|
c9317b5a68
|
Merge branch 'master' into routing
|
2012-09-28 21:41:21 +02:00 |
Christian Reiner
|
71454b1bca
|
Fix to preserve backward compatibility for apps creating static links containing the request token (currently the contacts app and maybe some 3rd party implementations)
|
2012-09-28 18:57:20 +02:00 |
|
Bart Visscher
|
bf1057143c
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
|
2012-09-28 15:38:49 +02:00 |
Christian Reiner
|
4dbd4c35c5
|
Merge branch 'master' of git://github.com/owncloud/core
|
2012-09-28 13:31:01 +02:00 |
|
Christian Reiner
|
743826bbf3
|
Reimplementation of CSRF protection including autorefresh
|
2012-09-28 13:30:44 +02:00 |
Jenkins for ownCloud
|
5144d26088
|
[tx-robot] updated from transifex
|
2012-09-28 02:06:03 +02:00 |
|
Jenkins for ownCloud
|
09aa95586a
|
[tx-robot] updated from transifex
|
2012-09-27 02:03:09 +02:00 |
|
Jenkins for ownCloud
|
2c00f8c850
|
[tx-robot] updated from transifex
|
2012-09-26 13:22:37 +02:00 |
Michael Gapczynski
|
b4e40b1c21
|
Fix unsetting share expiration date
|
2012-09-26 00:09:35 -04:00 |
|
Michael Gapczynski
|
00103d730f
|
Show share expiration date set for shared item
|
2012-09-26 00:04:27 -04:00 |
|
Michael Gapczynski
|
2bdf89f4d4
|
Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773
|
2012-09-25 23:18:36 -04:00 |
|
Jenkins for ownCloud
|
5855355faa
|
[tx-robot] updated from transifex
|
2012-09-26 02:06:37 +02:00 |
|
Jenkins for ownCloud
|
e5487376da
|
[tx-robot] updated from transifex
|
2012-09-25 02:05:18 +02:00 |
|
Jenkins for ownCloud
|
ecb90d72f3
|
[tx-robot] updated from transifex
|
2012-09-24 02:04:10 +02:00 |
Robin Appelman
|
a22a5d6807
|
some js style fixes
|
2012-09-23 03:16:52 +02:00 |
|
Jenkins for ownCloud
|
81ecabb19c
|
[tx-robot] updated from transifex
|
2012-09-23 02:04:41 +02:00 |
Lukas Reschke
|
ac79fe649c
|
Added a missing CSRF check
|
2012-09-22 11:02:03 +02:00 |
|
Jenkins for ownCloud
|
08132587d1
|
[tx-robot] updated from transifex
|
2012-09-22 02:01:19 +02:00 |
|
Jenkins for ownCloud
|
01160d0fb4
|
[tx-robot] updated from transifex
|
2012-09-22 01:18:31 +02:00 |
scambra
|
d5211f9615
|
some characters in comments avoid finding some strings to translate
|
2012-09-21 12:05:01 +02:00 |
|
scambra
|
0f15bc881f
|
fix translating dialog buttons, they are translated in core not dialogs app
|
2012-09-21 11:48:57 +02:00 |
|
scambra
|
22c6b48d2f
|
translate files_sharing app
|
2012-09-21 11:48:20 +02:00 |
Björn Schießle
|
b1c60841e8
|
float right element needs to be the first element, otherwise firefox will move it to a new line
|
2012-09-20 10:31:23 +02:00 |
Tom Needham
|
edbbb2bd9f
|
General style fixes for the share dropdown
|
2012-09-19 20:04:16 +00:00 |
|
Tom Needham
|
fb3724ba64
|
Fix datepicker icons for all uses across ownCloud
|
2012-09-19 16:51:20 +00:00 |
|
Michael Gapczynski
|
518ca0ac58
|
Fix changing of share status icons, bug fix for oc-1631
|
2012-09-19 01:44:15 -04:00 |
|
Michael Gapczynski
|
1e1e8ae3b5
|
Don't show the expiration option until a share occurs, bug fix for oc-1724
|
2012-09-19 01:02:57 -04:00 |
|
Jenkins for ownCloud
|
b0e645fe13
|
[tx-robot] updated from transifex
|
2012-09-19 02:07:26 +02:00 |
|
Jenkins for ownCloud
|
06e963c54f
|
[tx-robot] updated from transifex
|
2012-09-18 02:04:26 +02:00 |
|
Jenkins for ownCloud
|
dbd2dea689
|
[tx-robot] updated from transifex
|
2012-09-17 02:07:23 +02:00 |
|
Jenkins for ownCloud
|
e41ccd4344
|
[tx-robot] updated from transifex
|
2012-09-14 02:03:18 +02:00 |
Frank Karlitschek
|
df528cfe95
|
show the current username. This confused some people
|
2012-09-12 12:23:21 +02:00 |
|
Michael Gapczynski
|
60feaf9abf
|
Merge branch 'master' into share_expiration
Conflicts:
core/js/share.js
lib/util.php
|
2012-09-12 01:06:57 -04:00 |
|
Michael Gapczynski
|
54d4e556fe
|
Add lock and clock icon for sharing
|
2012-09-12 01:02:08 -04:00 |
|
Michael Gapczynski
|
8f0354bcdd
|
Temporarily disable sharing with contacts and emails, will come in next release
|
2012-09-12 01:02:08 -04:00 |
|
Jenkins for ownCloud
|
6a29bbda7a
|
[tx-robot] updated from transifex
|
2012-09-11 02:03:53 +02:00 |
|
Michael Gapczynski
|
6c17a4cb77
|
Don't display actions for children in shared collections, show the parent collection the child is shared in
|
2012-09-09 14:44:08 -04:00 |
|
Michael Gapczynski
|
13d513c17c
|
Fix shared collection item searching
|
2012-09-09 11:50:12 -04:00 |
|
Robin Appelman
|
a050915167
|
move breadcrumb css to core so we can reuse it
|
2012-09-09 03:00:01 +02:00 |
|
Robin Appelman
|
0b2633a787
|
add breadcrumb controll to js
|
2012-09-09 03:00:01 +02:00 |
|
Jenkins for ownCloud
|
5e790368bc
|
[tx-robot] updated from transifex
|
2012-09-09 02:03:35 +02:00 |
|
Robin Appelman
|
9beb958845
|
forgot a ,
|
2012-09-09 00:35:02 +02:00 |
|
Robin Appelman
|
b14265b5c3
|
add js versions of basename and dirname
|
2012-09-08 23:59:02 +02:00 |
|
Jenkins for ownCloud
|
d5d2e89622
|
[tx-robot] updated from transifex
|
2012-09-08 02:05:41 +02:00 |
|
Bart Visscher
|
edcd297476
|
Move handling of core remotes to OC_TemplateLayout
|
2012-09-07 16:42:46 +02:00 |
|
Bart Visscher
|
5eba579827
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
|
2012-09-07 15:51:44 +02:00 |
|
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
|
Jenkins for ownCloud
|
a94b56b57b
|
[tx-robot] updated from transifex
|
2012-09-07 02:07:22 +02:00 |
Jan-Christoph Borchardt
|
90462b2dcf
|
make icons look good on bright and dark backgrounds
|
2012-09-06 13:47:07 +02:00 |