Michael Gapczynski
|
ea23854328
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
|
2012-08-06 13:49:54 -04:00 |
Michael Gapczynski
|
3b2c853916
|
Lots of refactoring to share API
|
2012-08-06 11:27:13 -04:00 |
Jenkins for ownCloud
|
9ca8d20a99
|
[tx-robot] updated from transifex
|
2012-08-06 02:02:50 +02:00 |
Thomas Tanghus
|
80ca883d4c
|
Correct path to ajax file.
|
2012-08-05 03:36:16 +02:00 |
Jenkins for ownCloud
|
d7e77f6426
|
[tx-robot] updated from transifex
|
2012-08-04 02:04:21 +02:00 |
Thomas Tanghus
|
bef63527ce
|
Reorganize ajax scripts.
|
2012-08-03 21:32:27 +02:00 |
Thomas Tanghus
|
3610975bc1
|
Some fixes for keyboard shortcuts.
|
2012-08-03 21:32:27 +02:00 |
Thomas Tanghus
|
e3de746bb6
|
FF complained about missing charset.
|
2012-08-03 21:32:27 +02:00 |
Thomas Tanghus
|
578e074c00
|
White space.
|
2012-08-03 21:32:27 +02:00 |
Thomas Tanghus
|
98057dba5b
|
Revert "Removed text/plain header."
This reverts commit fa6d26b53c .
|
2012-08-03 21:32:27 +02:00 |
Michael Gapczynski
|
09bb3bfaf8
|
Preparing for proper collection implementation
|
2012-08-03 15:05:45 -04:00 |
Jenkins for ownCloud
|
7dc799c167
|
[tx-robot] updated from transifex
|
2012-08-03 02:04:12 +02:00 |
Thomas Tanghus
|
7dda5527f1
|
Return properly formatted jsondata.
|
2012-08-02 19:03:45 +02:00 |
Thomas Tanghus
|
d07f4a5ea8
|
Correct namespace usage.
|
2012-08-02 19:03:06 +02:00 |
Thomas Tanghus
|
40d2bb70d7
|
Remove logging
|
2012-08-02 19:01:55 +02:00 |
Thomas Tanghus
|
8f3357c305
|
I was a bit too fast in removing methods yesterday...
|
2012-08-02 18:57:03 +02:00 |
Thomas Tanghus
|
a484ee817c
|
If first addressbook was empty it was seen as if there where no contacts at all.
|
2012-08-02 18:50:20 +02:00 |
Thomas Tanghus
|
a1239a37aa
|
Line length...
|
2012-08-02 05:02:36 +02:00 |
Thomas Tanghus
|
30c3a783d9
|
Remove onunload handler when delete is cancelled.
|
2012-08-02 05:01:54 +02:00 |
Thomas Tanghus
|
20f8971222
|
Use popup class style for ninja-mode help.
|
2012-08-02 04:18:44 +02:00 |
Thomas Tanghus
|
f84e92e6e3
|
More files to delete \o/
|
2012-08-02 04:18:44 +02:00 |
Thomas Tanghus
|
937058cdec
|
Updated JS namespace.
|
2012-08-02 04:18:44 +02:00 |
Jenkins for ownCloud
|
91e828c6ce
|
[tx-robot] updated from transifex
|
2012-08-02 02:06:16 +02:00 |
Thomas Tanghus
|
f159f607de
|
And then the missing files ;)
|
2012-08-02 00:02:07 +02:00 |
Thomas Tanghus
|
a8faae4f42
|
Addressbooks settings rewrite and cleanup.
|
2012-08-02 00:02:07 +02:00 |
Jenkins for ownCloud
|
274d1ef87f
|
[tx-robot] updated from transifex
|
2012-08-01 02:02:35 +02:00 |
Jenkins for ownCloud
|
36ccaf51ed
|
[tx-robot] updated from transifex
|
2012-07-31 22:57:24 +02:00 |
Michael Gapczynski
|
94ce8f2168
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
|
2012-07-31 15:00:04 -04:00 |
Thomas Tanghus
|
5eed59bd54
|
Changed fix parameter to OC.appSettings().
|
2012-07-31 14:18:32 +02:00 |
Thomas Tanghus
|
90a1b5a758
|
Unregister from personal settings.
|
2012-07-31 12:23:22 +02:00 |
Thomas Tanghus
|
19c55e2d44
|
Implemented app settings in popup.
|
2012-07-31 12:23:22 +02:00 |
Thomas Tanghus
|
fa62ff62d2
|
Remove deprecated code.
|
2012-07-30 05:31:48 +02:00 |
Thomas Tanghus
|
d614c3b1d5
|
Code style.
|
2012-07-30 05:31:06 +02:00 |
Thomas Tanghus
|
118d9e17b6
|
Check if the are contacts marked as deleted and warn if so.
|
2012-07-30 04:57:14 +02:00 |
Thomas Tanghus
|
b25b73b5b4
|
Fixed potential error in logging.
|
2012-07-30 04:57:14 +02:00 |
Thomas Tanghus
|
fa6d26b53c
|
Removed text/plain header.
|
2012-07-30 04:57:14 +02:00 |
Jenkins for ownCloud
|
3430dcd367
|
[tx-robot] updated from transifex
|
2012-07-30 02:05:41 +02:00 |
Jenkins for ownCloud
|
18f6552a08
|
[tx-robot] updated from transifex
|
2012-07-29 02:06:29 +02:00 |
Jenkins for ownCloud
|
fa4052d6f1
|
[tx-robot] updated from transifex
|
2012-07-28 02:05:38 +02:00 |
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
Michael Gapczynski
|
30b58f5677
|
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
|
2012-07-25 17:08:18 -04:00 |
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
Thomas Tanghus
|
25e1c13ef7
|
Remove unused ajax file.
|
2012-07-23 01:17:38 +02:00 |
Thomas Tanghus
|
67b6ff22bc
|
Cache DOM lookups, general cleanup.
|
2012-07-23 01:17:38 +02:00 |
Thomas Tanghus
|
b60e5942a5
|
Cleaner event handling.
|
2012-07-23 01:17:38 +02:00 |
Thomas Tanghus
|
fb9ef90c45
|
No need to set checksum on PHOTO.
|
2012-07-23 01:17:38 +02:00 |
Thomas Tanghus
|
0439a18324
|
Cleaner variable handling.
|
2012-07-23 01:17:38 +02:00 |
Thomas Tanghus
|
b00de0258b
|
Make sure notifier cleans up.
|
2012-07-23 01:17:38 +02:00 |